--- loncom/homework/chemresponse.pm 2010/02/28 23:35:53 1.87 +++ loncom/homework/chemresponse.pm 2013/01/15 18:09:43 1.91 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.87 2010/02/28 23:35:53 raeburn Exp $ +# $Id: chemresponse.pm,v 1.91 2013/01/15 18:09:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -116,7 +116,7 @@ CHEMJS 'bgcolor' => '#FFFFFF',}); my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,}); - + my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled(); my $body=< @@ -143,7 +143,7 @@ $js -You have to enable Java and JavaScript on your machine. +$java_not_enabled $molecule
@@ -165,7 +165,7 @@ CHEMPAGE if (defined($shown_text)) { $display=&mt($shown_text); } my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; my $function = - 'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name(); + 'LONCAPA_draw_molecule_'.&get_uniq_name(); my $result=< function $function() { @@ -337,8 +337,8 @@ sub end_organicresponse { if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition(), - "$partid.$id"); # part.response + my $repetition = &Apache::response::repetition(); + &Apache::lonxml::increment_counter($repetition,"$partid.$id"); # part.response if ($target eq 'analyze') { $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id"); @@ -417,7 +417,8 @@ sub start_organicstructure { $id=&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}'; + $result .= '\graphicspath{{'.LONCAPA::tempdir(). + '}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}'; if ($options =~ /border/) { $result.= '} '; } } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); @@ -598,7 +599,8 @@ sub end_reactionresponse { if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition(), "$partid.$id"); + my $repetition = &Apache::response::repetition(); + &Apache::lonxml::increment_counter($repetition,"$partid.$id"); if ($target eq 'analyze') { $Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id"); @@ -642,5 +644,11 @@ sub end_chem { return $result; } +my $uniq=0; +sub get_uniq_name { + $uniq++; + return 'uniquename'.$uniq; +} + 1; __END__