--- loncom/interface/coursecatalog.pm	2007/10/02 01:10:27	1.21
+++ loncom/interface/coursecatalog.pm	2007/10/03 19:57:29	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.21 2007/10/02 01:10:27 albertel Exp $
+# $Id: coursecatalog.pm,v 1.22 2007/10/03 19:57:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@ sub course_selector {
     my $totcodes = 0;
     my $jscript = '';
     my ($numtitles,$lasttitle);
-    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
+    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
     if ($totcodes > 0) {
         $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
         if ($format_reply eq 'ok') {
@@ -431,7 +431,7 @@ sub print_course_listing {
     if ($env{'form.coursenum'} ne '') {
         %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.',
                                                  $env{'form.coursenum'},
-                                                 undef,undef,'Course');
+                                                 undef,undef,'Course',1);
         if (keys(%courses) == 0) {
             $output .= &mt('The courseID provided does not match a course in this domain.');
             return $output;
@@ -457,11 +457,11 @@ sub construct_data_table {
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
         $sortname{'Title'} = 'title';
-        $sortname{'Owner'} = 'owner';
+        $sortname{'Owner(s)'} = 'owner';
     }
     my $output = &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();
-    my @coltitles = ('Code','Sections','Crosslisted','Title','Owner');
+    my @coltitles = ('Code','Sections','Crosslisted','Title','Owner(s)');
     if (ref($usersections) eq 'HASH') {
        $coltitles[1] = 'Your Section';
     }
@@ -492,7 +492,7 @@ sub construct_data_table {
         if ($env{'form.sortby'} eq 'code') {
             push(@{$Sortby{$courseinfo{$course}{'code'}}},$course);
         } elsif ($env{'form.sortby'} eq 'owner') {
-            push(@{$Sortby{$courseinfo{$course}{'ownerlastname'}}},$course);
+            push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course);
         } else {
             push(@{$Sortby{$courseinfo{$course}{'title'}}},$course);
         }
@@ -520,7 +520,9 @@ sub build_courseinfo_hash {
     my $now = time;
     foreach my $course (keys(%{$courses})) {
         my $descr;
-        if ($courses->{$course} =~ m/^([^:]*):/i) {
+        if (ref($courses->{$course}) eq 'HASH') {
+            $descr = $courses->{$course}{'description'}; 
+        } elsif ($courses->{$course} =~ m/^([^:]*):/i) {
             $descr = &unescape($1);
         } else {
             $descr = &unescape($courses->{$course});
@@ -529,28 +531,50 @@ sub build_courseinfo_hash {
         $cleandesc=~s/'/\\'/g;
         $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
-
-        my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses->{$course});
-        $owner = &unescape($owner);
-        my ($ownername,$ownerdom);
-        if ($owner =~ /:/) {
-            ($ownername,$ownerdom) = split(/:/,$owner);
+        my ($descr,$instcode,$singleowner,$ttype,@owners,%ownernames);
+        if (ref($courses->{$course}) eq 'HASH') {
+            $descr = $courses->{$course}{'description'};
+            $instcode =  $courses->{$course}{'instcode'};
+            $singleowner = $courses->{$course}{'owner'};
+            $ttype =  $courses->{$course}{'type'};
+            push(@owners,$singleowner);
+            if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
+                foreach my $item (@{$courses->{$course}{'co-owners'}}) {
+                    push(@owners,$item);
+                }
+            }
         } else {
-            $ownername = $owner;
-            if ($owner ne '') {
-                $ownerdom = $cdom;
+            ($descr,$instcode,$singleowner,$ttype) = 
+                split(/:/,$courses->{$course});
+            push(@owners,$singleowner);
+        }
+        foreach my $owner (@owners) {
+            my ($ownername,$ownerdom) = @_; 
+            if ($owner =~ /:/) {
+                ($ownername,$ownerdom) = split(/:/,$owner);
+            } else {
+                $ownername = $owner;
+                if ($owner ne '') {
+                    $ownerdom = $cdom;
+                }
+            }
+            if ($ownername ne '' && $ownerdom ne '') {
+                my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom);
+                $ownernames{$ownername.':'.$ownerdom} = \%namehash; 
             }
-        }
-        my %ownernames;
-        if ($ownername ne '' && $ownerdom ne '') {
-            %ownernames = &Apache::loncommon::getnames($ownername,$ownerdom);
         }
         $courseinfo{$course}{'cdom'} = $cdom;
         $courseinfo{$course}{'cnum'} = $cnum;
         $courseinfo{$course}{'code'} = $instcode;
-        $courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'};
+        my @lastnames;
+        foreach my $owner (keys(%ownernames)) {
+            if (ref($ownernames{$owner}) eq 'HASH') {
+                push(@lastnames,$ownernames{$owner}{'lastname'});
+            }
+        }
+        $courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames));
         $courseinfo{$course}{'title'} = $cleandesc;
-        $courseinfo{$course}{'owner'} = $owner;
+        $courseinfo{$course}{'owner'} = $singleowner;
 
         my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
         my @classids;
@@ -571,11 +595,11 @@ sub build_courseinfo_hash {
         }
         $courseinfo{$course}{'showsyllabus'} = $showsyllabus;
         if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) ||
-            ($knownuser && ($details == 1))) {  
+            ($knownuser && ($details == 1))) {
             $courseinfo{$course}{'counts'} =  &count_students($cdom,$cnum,$numsec);
             $courseinfo{$course}{'autoenrollment'} =
                 &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
-                                 $instcode,$owner,$cdom,$cnum);
+                                 $instcode,\@owners,$cdom,$cnum);
 
             my $startaccess = '';
             my $endaccess = '';
@@ -641,7 +665,7 @@ sub courseinfo_row {
         $cdom = $info->{'cdom'};
         $cnum = $info->{'cnum'};
         $title = $info->{'title'};
-        $ownerlast = $info->{'ownerlastname'};
+        $ownerlast = $info->{'ownerlastnames'};
         $code = $info->{'code'};
         $owner = $info->{'owner'};
         $seclist = $info->{'seclist'};
@@ -703,7 +727,7 @@ sub identify_sections {
 }
 
 sub get_valid_classes {
-    my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_;
+    my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
     my $response;
     my %validations;
     @{$validations{'sections'}} = ();
@@ -712,7 +736,7 @@ sub get_valid_classes {
     if ($seclist) {
         foreach my $sec (split(/, /,$seclist)) {
             my $class = $crscode.$sec;
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
 							 $class) eq 'ok') {
                 if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
                     push(@{$validations{'sections'}},$sec);
@@ -723,7 +747,7 @@ sub get_valid_classes {
     }
     if ($xlist_items) {
         foreach my $item (split(/, /,$xlist_items)) {
-            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+            if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
 							 $item) eq 'ok') {
                 if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
                     push(@{$validations{'xlists'}},$item);
@@ -885,7 +909,7 @@ END
 }
 
 sub autoenroll_info {
-    my ($coursehash,$now,$seclist,$xlist_items,$code,$owner,$cdom,$cnum) = @_;
+    my ($coursehash,$now,$seclist,$xlist_items,$code,$owners,$cdom,$cnum) = @_;
     my $autoenrolldates = &mt('Not enabled');
     if (defined($coursehash->{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) {
         my ($autostart,$autoend);
@@ -901,7 +925,7 @@ sub autoenroll_info {
             } else {
                 my $valid_classes = 
                    &get_valid_classes($seclist,$xlist_items,$code,
-                                      $owner,$cdom,$cnum);
+                                      $owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
                     $autoenrolldates = &mt('Not enabled<br />Starts: ').
                                        $autostart.'<br />'.$valid_classes;                }
@@ -911,7 +935,7 @@ sub autoenroll_info {
                 $autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend;
             } else {
                 my $valid_classes = &get_valid_classes($seclist,$xlist_items,
-                                                       $code,$owner,$cdom,$cnum);
+                                                       $code,$owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
                     $autoenrolldates = &mt('Currently enabled<br />').
                                        $valid_classes;