--- loncom/homework/chemresponse.pm 2003/10/06 21:39:51 1.13
+++ loncom/homework/chemresponse.pm 2003/10/16 21:52:27 1.17
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.13 2003/10/06 21:39:51 albertel Exp $
+# $Id: chemresponse.pm,v 1.17 2003/10/16 21:52:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,7 +51,7 @@ SMILESECTION
JMESECTION
}
- if ($molecule) { $molecule=""; }
+ if ($molecule) { $molecule=''; }
my $body=<
@@ -113,14 +113,9 @@ sub start_organicresponse {
$molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
}
- my $multipart=&Apache::lonxml::get_param('multipart',$parstack,
- $safeeval);
- if ($multipart eq 'yes') {
- $multipart = 'multipart';
- } else {
- $multipart ='';
- }
- $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
$result.= '';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
@@ -194,6 +189,14 @@ sub end_organicresponse {
}
} 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('organicresponse');
+ foreach my $answer (@answers) {
+ $result.=&Apache::response::answer_part('organicresponse',$answer);
+ }
+ $result.=&Apache::response::answer_footer('organicresponse');
}
&Apache::response::end_response;
return $result;
@@ -204,19 +207,34 @@ sub start_organicstructure {
my $result;
if ($target eq 'web') {
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 $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
- $result=<
-
-
-
-CHEMOUTPUT
+ my $id=time.'_'.int(rand(1000));
+ $result="";
+ &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");
+ $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Width:','width',$token,5);
$result .=&Apache::edit::text_arg('Height:','height',$token,5);
+ $result .=&Apache::edit::text_arg('TeXwidth:','texwidth',$token,5);
$result .='';
$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
@@ -241,7 +259,7 @@ CHEMOUTPUT
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
'width','height',
- 'options');
+ 'texwidth','options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -310,7 +328,7 @@ sub end_reactionresponse {
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- my (@answers)=&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);
$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
my $ad;
@@ -327,6 +345,15 @@ sub end_reactionresponse {
}
} 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;