--- loncom/interface/lonpickcourse.pm	2004/12/23 18:46:48	1.22
+++ loncom/interface/lonpickcourse.pm	2005/01/27 19:20:55	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.22 2004/12/23 18:46:48 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.24 2005/01/27 19:20:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,17 +158,26 @@ function setSections() {
         opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)
     }
     else {
-        for (var i=0; i<numSections; i++) {
-            opener.document.$ENV{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
-        }
-        opener.document.$ENV{"form.form"}.currsec.multiple=true
-        if (numSections < 3) {
-            opener.document.$ENV{"form.form"}.currsec.size=numSections;
+        if (numSections == 1) {
+            opener.document.$ENV{"form.form"}.currsec.multiple=false;
+            opener.document.$ENV{"form.form"}.currsec.size=1;
+            opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('Select','',true,true);
+            opener.document.$ENV{"form.form"}.currsec.options[1] = new Option('No section','',false,false) 
+            opener.document.$ENV{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
         }
         else {
-            opener.document.$ENV{"form.form"}.currsec.size=3;
+            for (var i=0; i<numSections; i++) {
+                opener.document.$ENV{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
+            }
+            opener.document.$ENV{"form.form"}.currsec.multiple=true
+            if (numSections < 3) {
+                opener.document.$ENV{"form.form"}.currsec.size=numSections;
+            }
+            else {
+                opener.document.$ENV{"form.form"}.currsec.size=3;
+            }
+            opener.document.$ENV{"form.form"}.currsec.options[0].selected = false
         }
-        opener.document.$ENV{"form.form"}.currsec.options[0].selected = false
     }
     self.close()
 }
@@ -216,18 +225,31 @@ ENDSCRIPT
             } else {
                 $descr = &Apache::lonnet::unescape($courses{$course});
             }
-            $by_descrip{lc($descr)}=$course;
+            my $description = lc($descr);
+            if (exists($by_descrip{$description})) {
+                push @{$by_descrip{$description}}, ($course);
+            } else {
+                @{$by_descrip{$description}} = ($course);
+            }
 	}
 	foreach my $description (sort(keys(%by_descrip))) {
-	    my $course=$by_descrip{$description};
-	    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."')".'" /> '.$description.' ('.
-		  ($Apache::lonnet::domaindescription{$cdom}?
-                   $Apache::lonnet::domaindescription{$cdom}:$cdom).
-                 ")<br />\n");
+            foreach my $course (@{$by_descrip{$description}}) {
+	        my $cleandesc=&HTML::Entities::encode($description,'<>&"');
+	        $cleandesc=~s/'/\\'/g;
+	        my ($cdom,$cnum)=split(/\_/,$course);
+                my ($descr,$instcode,$owner) = split/:/,$courses{$course};
+	        $r->print('<input type="button" value="Select" onClick="gochoose('.
+		      "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
+		      ($Apache::lonnet::domaindescription{$cdom}?
+                       $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
+                unless ($instcode eq '') {
+                    $r->print(" - ".&Apache::lonnet::unescape($instcode));
+                }
+                unless ($owner eq '') {
+                    $r->print(", owner - ".&Apache::lonnet::unescape($owner));
+                }
+                $r->print("<br />\n");
+            }
 	}
 	if (!%courses) { $r->print(&mt('None found')); }
         $r->print('<input type="hidden" name="form" value="'.$ENV{'form.form'}.'" />'."\n".