--- loncom/interface/coursecatalog.pm	2008/07/04 15:40:04	1.34
+++ loncom/interface/coursecatalog.pm	2008/07/07 15:20:18	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.34 2008/07/04 15:40:04 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.36 2008/07/07 15:20:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,14 +71,32 @@ sub handler {
     }
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
+    my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
+    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+        $cathash = $domconfig{'coursecategories'}{'cats'};
+    } else {
+        $cathash = {};
+    }
+    my $subcats;
+    if ($env{'form.withsubcats'}) {
+        $subcats = \%subcathash;
+    }
+    &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
+                                           \%idx,\@jsarray,$subcats);
     if ($env{'form.coursenum'} ne '' && &user_is_known()) {
-        &course_details($r,$codedom,$formname,$domdesc);
+        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems);
     } else {
-        my $catlinks = &category_breadcrumbs($codedom);
+        my ($catlinks,$has_subcats) = &category_breadcrumbs($codedom,@cats);
         my $catjs = <<"ENDSCRIPT";
 
 function setCatDepth(depth) {
     document.coursecats.catalog_maxdepth.value = depth;
+    if (depth == '') {
+        document.coursecats.currcat_0.value = '';
+    }
     document.coursecats.submit();
     return;
 }
@@ -109,7 +127,7 @@ function setCourseId(caller) {
             if ($env{'form.currcat_0'} ne '') {
                 $r->print('<form name="'.$formname.
                           '" method="post" action="/adm/coursecatalog">'.
-                          &additional_filters($codedom)."\n");
+                          &additional_filters($codedom,$has_subcats)."\n");
                 my ($currdepth,$deeper) = &get_depth_values();
                 $r->print('<input type="hidden" name="catalog_maxdepth" value="'.
                           $deeper.'" />'."\n");
@@ -125,7 +143,7 @@ function setCourseId(caller) {
                           &mt('Display courses').'" /></form><br /><br />');
             }
             if ($env{'form.state'} eq 'listing') {
-                $r->print(&print_course_listing($codedom));
+                $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
             }
         }
     }
@@ -134,7 +152,7 @@ function setCourseId(caller) {
 }
 
 sub course_details {
-    my ($r,$codedom,$formname,$domdesc) = @_;
+    my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
@@ -156,7 +174,8 @@ sub course_details {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
     $r->print('<br />'.&mt('Detailed course information:').'<br /><br />'.
               '<form name="'.$formname.'" method="post">'.
-              &print_course_listing($codedom).'<br /><br />');
+              &print_course_listing($codedom,undef,$trails,$allitems).
+              '<br /><br />');
     $r->print('<a href = "javascript:document.coursecatalog.submit()">'.
               &mt('Back to course listing').'</a>'.
               '<input type="hidden" name="sortby" value="'.
@@ -351,20 +370,11 @@ sub cat_header {
 }
 
 sub category_breadcrumbs {
-    my ($dom) = @_;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
-    my (@cats,@trails,%allitems,%idx,@jsarray,$cathash);
-    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
-        $cathash = $domconfig{'coursecategories'}{'cats'};
-    } else {
-        $cathash = {};
-    }
-    &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,
-                                           \@jsarray);
+    my ($dom,@cats) = @_;
     my ($currdepth,$deeper) = &get_depth_values();
     my $currcat_str = '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" /><input type="hidden" name="showdom" value="'.$dom.'" />';
     my $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr>';
+    my $has_subcats;
     for (my $i=0; $i<$deeper; $i++) {
         $currcat_str .= '<input type="hidden" name="currcat_'.$i.'" value="'.$env{'form.currcat_'.$i}.'" />';
         my ($cattitle,$shallower);
@@ -385,22 +395,19 @@ sub category_breadcrumbs {
                              '<input type="hidden" name="currcat_0" value="instcode::0" />';
                 $env{'form.currcat_0'} = 'instcode::0';
             } else {
+                $has_subcats = 1;
                 $catlinks .= '<select name="currcat_0">'."\n";
                 if (@{$cats[0]} > 1) {
                     my $selstr;
                     if ($env{'form.currcat_0'} eq '') {
                         $selstr = ' selected="selected" ';
                     }
-                    $catlinks .= '<option value=""'.$selstr.'>'.&mt('Select').'</option>'."\n";
+                    $catlinks .= '<option value=""  selected="selected">'.&mt('Select').'</option>'."\n";
                 }
                 for (my $i=0; $i<@{$cats[0]}; $i++) {
                     my $name = $cats[0][$i];
                     my $item = &escape($name).'::0';
-                    my $selstr;
-                    if ($env{'form.currcat_'.$i} eq $item) {
-                        $selstr = ' selected="selected" ';
-                    }
-                    $catlinks .= '<option value="'.$item.'"'.$selstr.'>';
+                    $catlinks .= '<option value="'.$item.'">';
                     if ($name eq 'instcode') {
                         $catlinks .= &mt('Official courses (with institutional codes)');
                     } else {
@@ -431,8 +438,11 @@ sub category_breadcrumbs {
         }
         $catlinks .= '<td>'.$currcat;
         if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
+            $has_subcats = 1;
+            my $selstr;
             $catlinks .= ':&nbsp;<select name="currcat_'.$deeper.'">'.
-                         '<option value="" selected="selected">'.&mt('Select').'</option>';
+                         '<option value="" selected="selected">'.
+                         &mt('Select').'</option>';
             for (my $k=0; $k<@{$cats[$deeper]{$cat}}; $k++) {
                 my $name = $cats[$deeper]{$cat}[$k];
                 my $item = &escape($name).':'.&escape($cat).':'.$deeper;
@@ -443,7 +453,7 @@ sub category_breadcrumbs {
         }
     }
     $catlinks .= $currcat_str.'</td></tr></table></td>';
-    return $catlinks;
+    return ($catlinks,$has_subcats);
 }
 
 sub get_depth_values {
@@ -461,12 +471,40 @@ sub get_depth_values {
 }
 
 sub additional_filters {
-    my ($codedom) = @_;
+    my ($codedom,$has_subcats) = @_;
     my $output = '<table>';
+    if (($env{'form.currcat_0'} ne 'instcode::0') && 
+        ($env{'form.currcat_0'} ne '') && ($has_subcats)) {
+        my $include_subcat_status;
+        if ($env{'form.withsubcats'}) {
+            $include_subcat_status = 'checked="checked" ';
+        }
+        my $counter = $env{'form.catalog_maxdepth'};
+        if ($counter > 0) {
+            if ($env{'form.state'} eq 'listing') {
+                $counter --;
+            } elsif ($env{'form.currcat_'.$counter} eq '') {
+                $counter --;
+            }
+        }
+        my ($catname) = split(/:/,$env{'form.currcat_'.$counter});
+        if ($catname ne '') {
+            $output .= '<tr><td><label>'.
+                       '<input type="checkbox" name="withsubcats" value="1" '.
+                       $include_subcat_status.'/>'.
+                       &mt('Include subcategories within "[_1]"',$catname).
+                       '</label></td></tr>';
+        }
+    }
     my $show_selfenroll_status;
     if ($env{'form.showselfenroll'}) {
         $show_selfenroll_status = 'checked="checked" ';
     }
+    $output .= '<tr><td>'.
+               '<label><input type="checkbox" name="showselfenroll" value="1" '.
+               $show_selfenroll_status.'/>'.
+               &mt('Only show courses which allow self-enrollment').
+               '</label></td></tr>';
     if (&user_is_dc($codedom)) {
         my $showdetails_status;
         if ($env{'form.showdetails'}) {
@@ -479,7 +517,7 @@ sub additional_filters {
         my $dc_title = &Apache::lonnet::plaintext('dc');
         $output .= '<tr><td>'."\n".
                    '<label><input type="checkbox" name="showdetails" value="1" '.
-                   $showdetails_status.'/>'."\n".
+                   $showdetails_status.'/>'.
                    &mt('Show full details for each course ([_1] only)',$dc_title).
                    '</label>'."\n".'</td></tr><tr><td>'.
                    '<label><input type="checkbox" name="showhidden" value="1" '.
@@ -487,11 +525,7 @@ sub additional_filters {
                    &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title).
                    '</label>'."\n".'</td></tr>';
     }
-    $output .= '<tr><td>'.
-               '<label><input type="checkbox" name="showselfenroll" value="1" '.
-               $show_selfenroll_status.'/>'.
-               &mt('Only show courses which allow self-enrollment').
-               '</label></td></tr></table><br />';
+    $output .= '</table><br />';
     return $output;
 }
 
@@ -627,7 +661,7 @@ sub search_official_courselist {
 }
 
 sub search_courselist {
-    my ($domain) = @_;
+    my ($domain,$subcats) = @_;
     my $cat_maxdepth = $env{'form.catalog_maxdepth'};
     my $filter = $env{'form.currcat_'.$cat_maxdepth};
     if (($filter eq '') && ($cat_maxdepth > 0)) {
@@ -635,7 +669,24 @@ sub search_courselist {
         $filter = $env{'form.currcat_'.$shallower};
     }
     my %courses;
+    my $filterstr;
     if ($filter ne '') {
+        if ($env{'form.withsubcats'}) {
+            if (ref($subcats) eq 'HASH') {
+                if (ref($subcats->{$filter}) eq 'ARRAY') {
+                    $filterstr = join('&',@{$subcats->{$filter}});
+                    if ($filterstr ne '') {
+                        $filterstr = $filter.'&'.$filterstr;
+                    }
+                } else {
+                    $filterstr = $filter;
+                }
+            } else {
+                $filterstr = $filter;
+            }  
+        } else {
+            $filterstr = $filter; 
+        }
         my $showhidden;
         if (&user_is_dc($domain)) {
             $showhidden = $env{'form.showhidden'};
@@ -643,13 +694,13 @@ sub search_courselist {
         %courses = 
             &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
                                           '.',1,$env{'form.showselfenroll'},
-                                          $filter,$showhidden,'coursecatalog');
+                                          $filterstr,$showhidden,'coursecatalog');
     }
     return %courses;
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -671,7 +722,7 @@ sub print_course_listing {
         if ($env{'form.currcat_0'} eq 'instcode::0') {
             %courses = &search_official_courselist($domain,$numtitles);
         } else {
-            %courses = &search_courselist($domain);
+            %courses = &search_courselist($domain,$subcats);
         }
         if (keys(%courses) == 0) {
             $output = &mt('No courses match the criteria you selected.');
@@ -686,22 +737,32 @@ sub print_course_listing {
     my $now = time;
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
-    $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig);
-    $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+    $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);
+    if ($env{'form.coursenum'} ne '') {
+        $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+    }
     return $output;
 }
 
 sub construct_data_table {
-    my ($knownuser,$courses,$details,$usersections,$now,$domconfig) = @_;
+    my ($knownuser,$courses,$details,$usersections,$now,$domconfig,$trails,
+        $allitems) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
+        $sortname{'Categories'} = 'cats';
         $sortname{'Title'} = 'title';
         $sortname{'Owner(s)'} = 'owner';
     }
     my $output = &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();
-    my @coltitles = ('Count','Code','Sections','Crosslisted','Title','Owner(s)');
+    my @coltitles = ('Count');
+    if ($env{'form.currcat_0'} eq 'instcode::0') {
+        push(@coltitles,'Code');
+    } else {
+        push(@coltitles,'Categories');
+    }
+    push(@coltitles,('Sections','Crosslisted','Title','Owner(s)'));
     if (ref($usersections) eq 'HASH') {
        $coltitles[1] = 'Your Section';
     }
@@ -734,6 +795,8 @@ sub construct_data_table {
     foreach my $course (sort(keys(%{$courses}))) {
         if ($env{'form.sortby'} eq 'code') {
             push(@{$Sortby{$courseinfo{$course}{'code'}}},$course);
+        } elsif ($env{'form.sortby'} eq 'cats') {
+            push(@{$Sortby{$courseinfo{$course}{'categories'}}},$course);
         } elsif ($env{'form.sortby'} eq 'owner') {
             push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course);
         } else {
@@ -746,7 +809,8 @@ sub construct_data_table {
         }
     }
     my @sorted_courses;
-    if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner')) {
+    if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner') ||
+        ($env{'form.sortby'} eq 'cats')) {
         @sorted_courses = sort(keys(%Sortby));
     } else {
         @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
@@ -755,8 +819,8 @@ sub construct_data_table {
     foreach my $item (@sorted_courses) {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
-            $output.=&courseinfo_row($courseinfo{$course},$knownuser,
-                                     $details,\$count,$now,$course);
+            $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
+                                     \$count,$now,$course,$trails,$allitems);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
@@ -778,7 +842,7 @@ sub build_courseinfo_hash {
         $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
         my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
-            $selfenroll_start,$selfenroll_end,@owners,%ownernames);
+            $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
         if (ref($courses->{$course}) eq 'HASH') {
             $descr = $courses->{$course}{'description'};
             $instcode =  $courses->{$course}{'inst_code'};
@@ -787,6 +851,7 @@ sub build_courseinfo_hash {
             $selfenroll_types = $courses->{$course}{'selfenroll_types'};
             $selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
             $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
+            $categories = $courses->{$course}{'categories'};
             push(@owners,$singleowner);
             if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
                 foreach my $item (@{$courses->{$course}{'co-owners'}}) {
@@ -824,6 +889,7 @@ sub build_courseinfo_hash {
         $courseinfo{$course}{'selfenroll_types'} = $selfenroll_types;
         $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
         $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
+        $courseinfo{$course}{'categories'} = $categories;
 
         my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
         my @classids;
@@ -934,9 +1000,9 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
-        $accessdates,$showsyllabus,$counts,$autoenrollment,$output);
+        $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
     if (ref($info) eq 'HASH') {
         $cdom = $info->{'cdom'};
         $cnum = $info->{'cnum'};
@@ -950,14 +1016,30 @@ sub courseinfo_row {
         $counts = $info->{'counts'};
         $autoenrollment = $info->{'autoenrollment'};
         $showsyllabus = $info->{'showsyllabus'};
+        $categories = $info->{'categories'};
     } else {
         $output = '<td colspan="8">'.&mt('No information available for [_1].',
                                          $code).'</td>';
         return $output;
     }
-    $output .= '<td>'.$$countref.'</td>'.
-               '<td>'.$code.'</td>'.
-               '<td>'.$seclist.'</td>'.
+    $output .= '<td>'.$$countref.'</td>';
+    if ($env{'form.currcat_0'} eq 'instcode::0') {
+        $output .= '<td>'.$code.'</td>';
+    } else {
+        my ($categorylist,@cats);
+        if ($categories ne '') {
+            @cats = split('&',$categories);
+        }
+        if ((ref($trails) eq 'ARRAY') && (ref($allitems) eq 'HASH')) {
+            my @categories = map { $trails->[$allitems->{$_}]; } @cats;
+            $categorylist = join('<br />',@categories);
+        }
+        if ($categorylist eq '') {
+            $categorylist = '&nbsp;';
+        }
+        $output .= '<td>'.$categorylist.'</td>';
+    }
+    $output .= '<td>'.$seclist.'</td>'.
                '<td>'.$xlist_items.'</td>'.
                '<td>'.$title.'&nbsp;<font size="-2">';
     if ($showsyllabus) {