--- loncom/interface/coursecatalog.pm 2007/10/03 19:57:29 1.22 +++ loncom/interface/coursecatalog.pm 2007/10/06 04:32:49 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.22 2007/10/03 19:57:29 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.23 2007/10/06 04:32:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -522,10 +522,6 @@ sub build_courseinfo_hash { my $descr; if (ref($courses->{$course}) eq 'HASH') { $descr = $courses->{$course}{'description'}; - } elsif ($courses->{$course} =~ m/^([^:]*):/i) { - $descr = &unescape($1); - } else { - $descr = &unescape($courses->{$course}); } my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); $cleandesc=~s/'/\\'/g; @@ -534,7 +530,7 @@ sub build_courseinfo_hash { my ($descr,$instcode,$singleowner,$ttype,@owners,%ownernames); if (ref($courses->{$course}) eq 'HASH') { $descr = $courses->{$course}{'description'}; - $instcode = $courses->{$course}{'instcode'}; + $instcode = $courses->{$course}{'inst_code'}; $singleowner = $courses->{$course}{'owner'}; $ttype = $courses->{$course}{'type'}; push(@owners,$singleowner); @@ -543,10 +539,6 @@ sub build_courseinfo_hash { push(@owners,$item); } } - } else { - ($descr,$instcode,$singleowner,$ttype) = - split(/:/,$courses->{$course}); - push(@owners,$singleowner); } foreach my $owner (@owners) { my ($ownername,$ownerdom) = @_;