--- loncom/interface/lonpickcourse.pm	2004/05/07 17:53:01	1.15
+++ loncom/interface/lonpickcourse.pm	2004/06/29 14:56:32	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.15 2004/05/07 17:53:01 www Exp $
+# $Id: lonpickcourse.pm,v 1.17 2004/06/29 14:56:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,8 +62,7 @@ ENDDOCUMENT
 # description filter
     my $descriptfilter=$ENV{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }
-    my $listdescript=$descriptfilter;
-    $listdescript=~s/\"/\&quot\;/g;
+    my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
 # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;
@@ -132,15 +131,21 @@ ENDSCRIPT
 	$r->print('<form>');
 	my %by_descrip;
 	foreach my $course (keys %courses) {
-	    $by_descrip{lc($courses{$course})}=$course;
+            my $descr;
+            if ($courses{$course} =~ m/^([^:]*):/) {
+                $descr = &Apache::lonnet::unescape($1);
+            } else {
+                $descr = &Apache::lonnet::unescape($courses{$course});
+            }
+            $by_descrip{lc($descr)}=$course;
 	}
 	foreach my $description (sort(keys(%by_descrip))) {
 	    my $course=$by_descrip{$description};
-	    my $cleandesc=&HTML::Entities::encode($courses{$course},'<>&"');
+	    my $cleandesc=&HTML::Entities::encode($description,'<>&"');
 	    $cleandesc=~s/'/\\'/g;
 	    my ($cdom,$cnum)=split(/\_/,$course);
 	    $r->print('<input type="button" value="Select" onClick="gochoose('.
-		  "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$courses{$course}.' ('.
+		  "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
 		  ($Apache::lonnet::domaindescription{$cdom}?
                    $Apache::lonnet::domaindescription{$cdom}:$cdom).
                  ")<br />\n");