--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/09 22:10:02	1.28
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/10 13:47:48	1.30
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.28 2003/10/09 22:10:02 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.30 2003/10/10 13:47:48 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,8 +64,8 @@ sub BuildProblemAnalysisPage {
             $base = "http://".$ENV{'SERVER_NAME'}.$base;
             my $rendered_problem = 
                 &Apache::lonnet::ssi_body($resource->{'src'});
-            $rendered_problem =~ s/<form /<nop /g;
-            $rendered_problem =~ s/<\s*\/form\s>/<\/nop>/g;
+            $rendered_problem =~ s/<\s*form\s*/<nop /g;
+            $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
             $r->print('<table bgcolor="ffffff"><tr><td>'.
                       '<base href="'.$base.'" />'.
                       $rendered_problem.
@@ -191,7 +191,7 @@ sub DoTriesAnalysis {
                  $PlotData[$i]->{'good'},
                  $PlotData[$i]->{'bad'});
         } else {
-            $graphlink = &Apache::loncomon::DrawGraph
+            $graphlink = &Apache::loncommon::DrawGraph
                 ('Attempt '.$i.', '.$minstu.'-'.$maxstu.
                  ' students',
                  'Foil Number',