Diff for /loncom/interface/coursecatalog.pm between versions 1.28 and 1.29

version 1.28, 2008/05/29 04:29:33 version 1.29, 2008/05/29 06:18:07
Line 350  sub category_breadcrumbs { Line 350  sub category_breadcrumbs {
     my $currcat_str;      my $currcat_str;
     if ($env{'form.catalog_maxdepth'} ne '') {      if ($env{'form.catalog_maxdepth'} ne '') {
         $currdepth = $env{'form.catalog_maxdepth'};          $currdepth = $env{'form.catalog_maxdepth'};
         $deeper = $currdepth + 1;          if ($env{'form.currcat_'.$currdepth} eq '') {
               $deeper = $currdepth;
           } else {
               $deeper = $currdepth + 1;
           }
     }      }
     $currcat_str = '<input type="hidden" name="catalog_maxdepth" value="'.$deeper.'" /><input type="hidden" name="showdom" value="'.$dom.'" />';      $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 $catlinks = '<td valign="top"><b>'.&mt('Catalog:').'</b></td><td><table><tr>';
Line 406  sub category_breadcrumbs { Line 410  sub category_breadcrumbs {
             $env{'form.currcat_0'} = 'instcode::0';              $env{'form.currcat_0'} = 'instcode::0';
         }          }
     } else {      } else {
         my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth});          my ($cat,$container,$depth);
           if ($env{'form.currcat_'.$currdepth} eq '') {
               my $shallower = $currdepth - 1;
               ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
           } else {
               ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth});
           }
         my $deeper = $depth +1;          my $deeper = $depth +1;
         my $currcat = $cat;          my $currcat = $cat;
         if ($cat eq 'instcode') {          if ($cat eq 'instcode') {
Line 559  sub search_courselist { Line 569  sub search_courselist {
     my ($domain) = @_;      my ($domain) = @_;
     my $cat_maxdepth = $env{'form.catalog_maxdepth'};      my $cat_maxdepth = $env{'form.catalog_maxdepth'};
     my $filter = $env{'form.currcat_'.$cat_maxdepth};      my $filter = $env{'form.currcat_'.$cat_maxdepth};
       if (($filter eq '') && ($cat_maxdepth > 0)) {
           my $shallower = $cat_maxdepth - 1;
           $filter = $env{'form.currcat_'.$shallower};
       }
     my %courses;      my %courses;
     if ($filter ne '') {      if ($filter ne '') {
         %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',          %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',

Removed from v.1.28  
changed lines
  Added in v.1.29


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>