--- loncom/interface/lonpickcourse.pm	2004/11/23 18:03:04	1.19
+++ 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.19 2004/11/23 18:03:04 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.24 2005/01/27 19:20:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@ ENDDOCUMENT
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
 			       'sincefilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'pickedcourse']);
+                               'pickedcourse','instcodefilter','ownerfilter']);
 # domain filter and selection
     my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -64,6 +64,14 @@ ENDDOCUMENT
     my $descriptfilter=$ENV{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }
     my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
+# institutional code filter
+    my $instcodefilter=$ENV{'form.instcodefilter'};
+    unless ($instcodefilter) { $instcodefilter=''; }
+    my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
+# course owner filter
+    my $ownerfilter=$ENV{'form.ownerfilter'};
+    unless ($ownerfilter) { $ownerfilter=''; }
+    my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
 # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;
@@ -82,7 +90,6 @@ ENDDOCUMENT
 # if called from loncreateuser, report sections, then close
     my ($loaditem,$seclist);
     my $num_sections = 0;
-    my @sections = ();
     if ($ENV{'form.form'} eq 'cu' && $ENV{'form.pickedcourse'}) {
         $loaditem = 'onLoad="setSections()"';
         my ($cdom,$cnum) = split/_/,$ENV{'form.pickedcourse'};
@@ -98,7 +105,9 @@ ENDDOCUMENT
     my %lt=&Apache::lonlocal::texthash(
 				       'cac' => 'Course Activity',
 				       'cde' => 'Course Description',
-				       'cdo' => 'Course Domain');
+				       'cdo' => 'Course Domain',
+                                       'cin' => 'Course Institutional Code',
+                                       'cow' => "Course Owner's usename");
     my ($name_code,$name_input);
     if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {
 	$name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";
@@ -144,20 +153,31 @@ function setSections() {
     var sectionsArray = new Array("$seclist")
     opener.document.$ENV{"form.form"}.currsec.length = 0
     if (numSections == 0) {
-        opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('No existing sections','-1',false,false)
+        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('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()
 }
@@ -173,6 +193,12 @@ $lt{'cac'}: $sincefilterform
 <br />
 $lt{'cdo'}: $domainselectform
 <br />
+$lt{'cin'}:
+<input type="text" name="instcodefilter" size="10" value="$listinstcode" />
+<br />
+$lt{'cow'}:
+<input type="text" name="ownerfilter" size="10" value="$listowner" />
+<br />
 $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />
 <p><input type="submit" name="gosearch" value="Search" /></p>
@@ -184,10 +210,12 @@ ENDSCRIPT
         $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
         $r->rflush();
 	unless ($descriptfilter) { $descriptfilter='.'; }
+        unless ($instcodefilter) { $instcodefilter='.'; }
+        unless ($ownerfilter) { $ownerfilter='.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);
 	my %courses=
 	    &Apache::lonnet::courseiddump
-	    ($domainfilter,$descriptfilter,$timefilter);
+	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter);
 	$r->print('<form name="courselist">');
 	my %by_descrip;
 	foreach my $course (keys %courses) {
@@ -197,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".