--- loncom/interface/lonhelper.pm	2006/05/16 20:45:26	1.150
+++ loncom/interface/lonhelper.pm	2006/05/30 12:46:09	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.150 2006/05/16 20:45:26 albertel Exp $
+# $Id: lonhelper.pm,v 1.152 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,7 +183,10 @@ use Apache::File;
 use Apache::lonxml;
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::longroup;
 use Apache::lonselstudent;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 # Register all the tags with the helper, so the helper can 
 # push and pop them
@@ -468,8 +471,8 @@ sub _varsInFile {
     my $self = shift;
     my @vars = ();
     for my $key (keys %{$self->{VARS}}) {
-        push @vars, &Apache::lonnet::escape($key) . '=' .
-            &Apache::lonnet::escape($self->{VARS}->{$key});
+        push @vars, &escape($key) . '=' .
+            &escape($self->{VARS}->{$key});
     }
     return join ('&', @vars);
 }
@@ -2848,7 +2851,7 @@ sub start_section {
     return if ($token->[2]{'onlysections'});
 
     # add in groups to the end of the list
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     foreach my $group_name (sort(keys(%curr_groups))) {
 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
@@ -2912,7 +2915,7 @@ sub start_group {
     # Populate the CHOICES element
     my %choices;
 
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     foreach my $group_name (sort {lc($a) cmp lc($b)} (keys(%curr_groups))) {
 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }