--- loncom/interface/lonpickcourse.pm	2006/05/09 15:09:27	1.45
+++ loncom/interface/lonpickcourse.pm	2006/05/30 12:46:09	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.45 2006/05/09 15:09:27 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.47 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,9 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -106,7 +109,7 @@ sub handler {
         my @sections =  (sort {$a <=> $b} keys(%sections_count));
 	$seclist = join('","',@sections);
 
-        my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
 	$groupslist = join(',',sort(keys(%curr_groups)));
     }
     my $jscript;
@@ -285,9 +288,9 @@ ENDSCRIPT
 	foreach my $course (keys(%courses)) {
             my $descr;
             if ($courses{$course} =~ m/^([^:]*):/i) {
-                $descr = &Apache::lonnet::unescape($1);
+                $descr = &unescape($1);
             } else {
-                $descr = &Apache::lonnet::unescape($courses{$course});
+                $descr = &unescape($courses{$course});
             }
             my $description = $descr;
             push (@{$by_descrip{$description}}, $course);
@@ -310,10 +313,10 @@ ENDSCRIPT
 		      ($Apache::lonnet::domaindescription{$cdom}?
                        $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
                 unless ($instcode eq '') {
-                    $r->print(" - ".&Apache::lonnet::unescape($instcode));
+                    $r->print(" - ".&unescape($instcode));
                 }
                 unless ($owner eq '') {
-                    $r->print(", owner - ".&Apache::lonnet::unescape($owner));
+                    $r->print(", owner - ".&unescape($owner));
                 }
 		if ($multiple) { $r->print("</label>\n"); }
                 $r->print("<br />\n");