--- loncom/xml/lonxml.pm	2003/11/06 19:24:11	1.291
+++ loncom/xml/lonxml.pm	2003/11/20 21:43:24	1.293
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.291 2003/11/06 19:24:11 sakharuk Exp $
+# $Id: lonxml.pm,v 1.293 2003/11/20 21:43:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -337,8 +337,8 @@ sub xmlparse {
                           &Apache::style::styleparser($target,$styletext));
        }
     }
- } elsif ($ENV{'construction_space_style'} && ($ENV{'request.state'} eq 'construct')) {
-     my $location=&Apache::lonnet::filelocation('',$ENV{'construction_space_style'});
+ } elsif ($ENV{'construct.style'} && ($ENV{'request.state'} eq 'construct')) {
+     my $location=&Apache::lonnet::filelocation('',$ENV{'construct.style'});
      my $styletext=&Apache::lonnet::getfile($location);
        if ($styletext ne '-1') {
           %style_for_target = (%style_for_target,
@@ -992,6 +992,7 @@ sub parstring {
       my $val=$token->[2]->{$_};
       $val =~ s/([\%\@\\\"\'])/\\$1/g;
       #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+      if ($val !~ m/^\s*\$[a-z_]/i) { $val =~ s/\$/\\\$/g; }
       $temp .= "my \$$_=\"$val\";";
     }
   }