--- loncom/interface/lonpickcourse.pm 2006/03/15 22:11:04 1.40 +++ loncom/interface/lonpickcourse.pm 2009/05/05 05:30:00 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.40 2006/03/15 22:11:04 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.80 2009/05/05 05:30:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,9 @@ use Apache::loncommon; use Apache::loncoursedata; use Apache::lonnet; use Apache::lonlocal; +use Apache::longroup; +use Apache::courseclassifier; +use LONCAPA; sub handler { my $r = shift; @@ -42,298 +45,691 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - $r->print(&Apache::lonxml::xmlbegin(). - &Apache::loncommon::head()); -# Get parameters from query string + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', - 'sincefilter','form','cnumelement', + ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', - 'pickedcourse','instcodefilter', - 'ownerfilter','coursefilter','multiple']); -# domain filter and selection - my $domainfilter=$env{'form.domainfilter'}; - $domainfilter=~s/\W//g; - unless ($domainfilter) { $domainfilter=''; } - my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter, - 'domainfilter',1); -# description filter - 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,'<>&"'); -# course ID filter for DCs only - my ($courseidtag,$coursefilter); - if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'. - $domainfilter.'/'})) { - $coursefilter=$env{'form.coursefilter'}; - unless ($coursefilter) { $coursefilter=''; } - my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"'); - $courseidtag = &mt('LON-CAPA course ID'); - $courseidtag .= qq|: -
- |; - } -# last course activity filter and selection - my $sincefilter=$env{'form.sincefilter'}; - $sincefilter=~s/[^\d-]//g; - unless ($sincefilter) { $sincefilter=-1; } - my $sincefilterform=&Apache::loncommon::select_form($sincefilter, - 'sincefilter',('-1'=>'', - '86400' => 'today', - '604800' => 'last week', - '2592000' => 'last month', - '7776000' => 'last three months', - '15552000' => 'last six months', - '31104000' => 'last year', - 'select_form_order' => - ['-1','86400','604800','2592000','7776000', - '15552000','31104000'])); -# if called from loncreateuser, report sections, then close - my ($loaditem,$seclist); - my $num_sections = 0; - if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { - $loaditem = 'onLoad="setSections()"'; - my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; - my %sections_count = (); - $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count); - my @sections = (); - if ($num_sections > 0) { - @sections = (sort {$a <=> $b} keys(%sections_count)); - $seclist = join('","',@sections); - } + 'multiple','type','setroles','fixeddom']); + + my ($type,$title,$jscript,$multelement,$multiple,$roleelement, + $lastaction,$autosubmit,$submitopener); + + # Get course type - Course or Non-standard Course. + $type = $env{'form.type'}; + if (!defined($env{'form.type'})) { + $type = 'Course'; } - my $jscript; - my $title = 'Selecting a course'; -# Setup for multiple course selections, if flag for multiples set. - my $multiple = $env{'form.multiple'}; - my $multelement; + $title = &mt('Selecting a [_1]',$type); + + # Setup for multiple course selections, if flag for multiples set. + $multiple = $env{'form.multiple'}; if ($multiple) { - $title = 'Selecting course(s)'; - $jscript = &Apache::loncommon::check_uncheck_jscript(); - $multelement = ''; - } - $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1)); - my %lt=&Apache::lonlocal::texthash( - 'cac' => 'Course Activity', - 'cde' => 'Course Description', - 'cdo' => 'Course Domain', - 'cin' => 'Course Institutional Code', - 'cow' => "Course Owner's Username"); - 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;"; - $name_input =''; - } - my $submitopener = ''; - my $autosubmit = ''; - my $roleelement = ''; - my $lastaction = 'self.close()'; - if ($env{'form.form'} eq 'cu') { - $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". - 'document.courselist.submit();'; + ($jscript,$multelement) = &multiples_tag(); + $title = &mt('Selecting [_1](s)',lc($type)); } + + # if called when a DC is selecting a course my $roledom = $env{'form.roleelement'}; if ($roledom) { $roleelement = ''; - $submitopener = &Apache::lonroles::processpick(); + $submitopener = &processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } - $r->print(< -function gochoose(cname,cdom,cdesc,multiple,caller) { - var openerForm = "$env{'form.form'}"; - courseCount = 0; - var courses = ''; - if (multiple) { - if (typeof(document.courselist.course_id.length) == 'undefined') { - // only 1 course checkbox was created - if (document.courselist.course_id.checked) { - courses = courses + document.courselist.course_id.value + "&&"; - courseCount ++; - } - } else { - for (var j=0; j 0) { - courses = courses.substr(0,courses.length-2); - opener.document.$env{'form.form'}.courselist.value = courses; - } + + my $onlyown = 0; + # if called to assign course-based portfolio access control + if ((($env{'form.form'} eq 'portform') && (!$env{'user.adv'}))) { + $onlyown = 1; + } + + my %loaditem; + if ($env{'form.numtitles'}) { + $loaditem{'onload'} = 'setElements(); '; + } + + if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && + ($env{'form.pickedcourse'})) { + $loaditem{'onload'} .= 'setSections()'; + } + $r->print(&Apache::loncommon::start_page($title,undef, + {'add_entries' => \%loaditem, + 'no_nav_bar' => 1, })); + + if ($env{'form.form'} eq 'portform') { + $lastaction = 'document.courselist.submit()'; + } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' && + !$multiple)) { + $lastaction = + 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". + 'document.courselist.submit();'; } else { - $name_code - opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname; - var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'}; - if (slct.options == undefined) { - opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom; - } - else { - var i; - for (i=0;iprint(&create_user_javascript($type)); + } + + # print javascript functions for choosing a course + if ($env{'form.gosearch'} || $onlyown) { + $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction)); + } + $r->print(''); + $r->print($submitopener); + +# ------------------------------------------ Display of filters to limit search + my $filter = {}; + my $action = '/adm/pickcourse'; + my ($numtitles,$showroles,$nohost); + if (!$onlyown) { + my $filterlist = ['domainfilter','descriptfilter', + 'instcodefilter']; + if ($env{'form.form'} eq 'rules') { + push(@{$filterlist},'personfilter'); + if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) { + if (&Apache::lonnet::homeserver($env{'form.personfilter'}, + $env{'form.persondomfilter'}) eq 'no_host') { + $nohost = 1; + } else { + $showroles = 1; + } } + } else { + push(@{$filterlist},'ownerfilter'); } + # course ID filter for DCs only + if ($env{'user.adv'} && $env{'form.domainfilter'} && + exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) { + push(@{$filterlist},'coursefilter'); + } + $r->print(&build_filters($filterlist,$type,$roleelement,$multelement, + $filter,$action,\$numtitles)); } - $autosubmit - $lastaction + +# ---------------------------------------------------------------- Get the data + if ($env{'form.gosearch'} || $onlyown) { + my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles); + if ($nohost) { + $r->print (''. + &mt('User does not exist - username: [_1], domain: [_2].', + ''.$filter->{'personfilter'}.'', + ''.$filter->{'persondomfilter'}.'').''); + } else { + &display_matched_courses($r,$type,$multiple,$action,$showroles,%courses); + } + } + $r->print(&Apache::loncommon::end_page()); + return OK; } -function setSections() { - var numSections = $num_sections - var sectionsArray = new Array("$seclist") - opener.document.$env{"form.form"}.currsec.length = 0 - if (numSections == 0) { - 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) +sub processpick { + my $openerform = 'rolechoice'; + if ($env{'form.form'} eq 'studentform') { + $openerform = $env{'form.form'}; + } + my $process_pick = <<"ENDONE"; + +"; + return $process_pick; +} + +sub create_user_javascript { + my ($type) = @_; + my $output; + #javascript for reporting sections and groups then closing + if ($env{'form.pickedcourse'}) { + my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; + my $sec_element = 'currsec'; + my $grplist_element = 'groups'; + my ($sections,$groups) = + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,'',$type); + my $num_sections = scalar(@{$sections}); + my $seclist = join(',',@{$sections}); + my $num_groups = scalar(@{$groups}); + my $groupslist = join(',',@{$groups}); + $output = qq| + +|; +; + } + return $output; +} + +sub display_matched_courses { + my ($r,$type,$multiple,$action,$showroles,%courses) = @_; + if ($env{'form.form'} eq 'portform') { + $action = '/adm/portfolio'; + } + my $numcourses = keys(%courses); + $r->print('
'); + if ($env{'form.form'} eq 'modifycourse') { + if ($numcourses > 0) { + my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $ccrolechk = ' checked="checked" '; + my $menuchk = ' '; + if ($env{'form.prevphase'} ne '') { + $ccrolechk = ' '; + $menuchk = ' checked="checked" '; + } + $r->print( + '
' + .''.&mt('Action').'' + .'
' + .'
' + .'
' + .'
' + ); + } + } + my %by_descrip; + foreach my $course (keys(%courses)) { + my $descr; + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + } elsif ($courses{$course} =~ m/^([^:]*):/i) { + $descr = &unescape($1); } else { - for (var i=0; i 1 && $multiple) { + $r->print(' +    +

'); + } + + if (%courses) { + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''.&mt('Select').'' + .''.&mt('Course Title').'' + .''.&mt('Domain').'' + .''.&mt('Course Code').'' + .''.&mt('Owner/Co-owner(s)').'' + .''.&mt('Type').'' + ); + if ($showroles) { + $r->print(''.&mt("Role(s) for [_1]", + &Apache::loncommon::plainname($env{'form.personfilter'}, + $env{'form.persondomfilter'},'firstname')).''); + } + $r->print(&Apache::loncommon::end_data_table_header_row()); + } + foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) { + foreach my $course (@{$by_descrip{$description}}) { + $r->print(&Apache::loncommon::start_data_table_row()); + my $cleandesc=&HTML::Entities::encode($description,'<>&"'); + $cleandesc=~s/'/\\'/g; + my ($cdom,$cnum)=split(/\_/,$course); + my ($descr,$instcode,$ttype,@owners); + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + $instcode = $courses{$course}{'inst_code'}; + $ttype = $courses{$course}{'type'}; + push(@owners,&unescape($courses{$course}{'owner'})); + if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') { + foreach my $item (@{$courses{$course}{'co-owners'}}) { + push(@owners,&unescape($item)); + } + } + } else { + my $singleowner; + ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course}); + push(@owners,&unescape($singleowner)); } - opener.document.$env{"form.form"}.currsec.multiple=true - if (numSections < 3) { - opener.document.$env{"form.form"}.currsec.size=numSections; + my $ownerstr = join(', ',@owners); + $r->print(''.&course_chooser($multiple,$cdom,$cnum,$cleandesc).''); + $r->print(''.$description.''); + $r->print(''); + $r->print(&Apache::lonnet::domain($cdom,'description')? + $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom); + $r->print(''); + $r->print(''); + if ($instcode ne '') { + $r->print(&unescape($instcode)); } else { - opener.document.$env{"form.form"}.currsec.size=3; + $r->print(' '); + } + $r->print(''); + $r->print(''.$ownerstr.''); + $r->print(''); + if ($ttype ne '') { + $r->print(&mt(&unescape($ttype))); + } else { + $r->print(' '); + } + $r->print(''); + if ($showroles) { + $r->print(''); + my $rolestr; + if (ref($courses{$course}{'roles'}) eq 'ARRAY') { + my @roles = sort(@{$courses{$course}{'roles'}}); + foreach my $role (@roles) { + if ($role =~ /^cr/) { + my (undef,$crdom,$crname,$crtitle) = split('/',$role); + $rolestr .= $crtitle.', '; + } else { + $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', '; + } + } + $rolestr =~ s/\, $//; + } + $r->print($rolestr.''); } - opener.document.$env{"form.form"}.currsec.options[0].selected = false + if ($multiple) { $r->print("\n"); } + $r->print(&Apache::loncommon::end_data_table_row()); + # $r->print("
\n"); } } - self.close() + if (%courses) { + $r->print(&Apache::loncommon::end_data_table()); + } + + if (!%courses) { + $r->print(&mt('None found')); + } elsif ($multiple) { + $r->print(''); + } + $r->print(''. + "\n".''."\n". + ''."\n"); + if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { + $r->print(''."\n"); + } + if ($env{'form.form'} eq 'portform') { + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + } elsif ($env{'form.form'} eq 'modifycourse') { + $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state'])); + } else { + $r->print(''."\n". + ''."\n"); + } + if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) { + $r->print(''); + } + if ($env{'form.numtitles'}) { + $r->print(''); + } + $r->print("\n"); + return; } -$jscript - -$submitopener -
+sub multiples_tag { + my $jscript = &Apache::loncommon::check_uncheck_jscript(); + my $multelement = ''; + return ($jscript,$multelement); +} + +sub build_filters { + my ($filterlist,$type,$roleelement,$multelement,$filter,$action, + $numtitlesref) = @_; + my $list; + my $formname; + my ($fixeddom,$codedom,$jscript); + if (defined($env{'form.form'})) { + $formname = $env{'form.form'}; + } + my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform, + $instcodeform,$typeselectform,$instcodetitle); + foreach my $item (@{$filterlist}) { + $filter->{$item} = $env{'form.'.$item}; + if ($item ne 'descriptfilter' && $item ne 'instcodefilter') { + if ($item eq 'domainfilter') { + $filter->{$item} = &LONCAPA::clean_domain($filter->{$item}); + } elsif ($item eq 'coursefilter') { + $filter->{$item} = &LONCAPA::clean_courseid($filter->{$item}); + } elsif ($item eq 'ownerfilter') { + $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + $filter->{'ownerdomfilter'} = + &LONCAPA::clean_domain($env{'form.ownerdomfilter'}); + $ownerdomselectform = + &Apache::loncommon::select_dom_form($filter->{'ownerdomfilter'}, + 'ownerdomfilter',1); + } elsif ($item eq 'personfilter') { + $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + if ($env{'form.persondomfilter'} eq '') { + unless ($env{'form.gosearch'}) { + $filter->{'persondomfilter'} = $env{'request.role.domain'}; + } + } else { + $filter->{'persondomfilter'} = + &LONCAPA::clean_domain($env{'form.persondomfilter'}); + } + $persondomselectform = + &Apache::loncommon::select_dom_form($filter->{'persondomfilter'}, + 'persondomfilter',1); + } else { + $filter->{$item} =~ s/\W//g; + } + if (!$filter->{$item}) { + $filter->{$item} = ''; + } + } + if ($item eq 'domainfilter') { + my $allow_blank = 1; + if ($formname eq 'portform') { + $filter->{$item} ||= $env{'user.domain'}; + $allow_blank=0; + } elsif ($formname eq 'studentform') { + $filter->{$item} ||= $env{'request.role.domain'}; + $allow_blank=0; + } + if ($env{'form.fixeddom'}) { + $domainselectform = ''. + &Apache::lonnet::domain($env{'request.role.domain'}, + 'description'); + $codedom = $env{'request.role.domain'}; + } else { + $domainselectform = + &Apache::loncommon::select_dom_form($filter->{$item}, + 'domainfilter', + $allow_blank); + $codedom = $filter->{'domainfilter'}; + } + } else { + $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"'); + } + } + + # last course activity filter and selection + $filter->{'sincefilter'} = $env{'form.sincefilter'}; + $filter->{'sincefilter'} =~ s/[^\d-]//g; + if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; } + $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'}, + 'sincefilter',('-1'=>'', + '86400' => 'today', + '604800' => 'last week', + '2592000' => 'last month', + '7776000' => 'last three months', + '15552000' => 'last six months', + '31104000' => 'last year', + 'select_form_order' => + ['-1','86400','604800','2592000','7776000', + '15552000','31104000'])); + + my %lt = ( + 'cac' => &mt("$type Activity"), + 'cde' => &mt("$type Title"), + 'cdo' => &mt("$type Domain"), + 'ins' => &mt('Institutional Code'), + 'inc' => &mt('Institutional Categorization'), + 'cow' => &mt("$type Owner/Co-owner"), + 'cop' => &mt("$type Personnel Includes"), + 'cog' => &mt('Course Type') + ); + + $typeselectform = ''; + $instcodetitle = $lt{'ins'}; + } else { + $instcodetitle = $lt{'inc'}; + } + if ($env{'form.fixeddom'}) { + $instcodetitle .= '
('.$codedom.')'; + } + if ($jscript ne '') { + $jscript = ''."\n"; + } + } + foreach my $posstype ('Course','Non-standard Course') { + $typeselectform.='\n"; + } + $typeselectform.=""; + my $output = qq| + + +|; + if ($formname eq 'modifycourse') { + $output .= ''."\n". + ''."\n"; + } else { + my $name_input; + if ($env{'form.cnameelement'} ne '') { + $name_input = ''; + } + $output .= qq| $name_input - $roleelement $multelement -$lt{'cac'}: $sincefilterform -
-$lt{'cdo'}: $domainselectform -
-$lt{'cin'}: - -
-$lt{'cow'}: - -
-$courseidtag -$lt{'cde'}: - -

-
-
-ENDSCRIPT -# ---------------------------------------------------------------- Get the data - if ($env{'form.gosearch'}) { - $r->print(&mt('Searching').' ...
 
'); +|; + if ($formname eq 'portform') { + $output .= ''."\n"; + } + } + if ($env{'form.fixeddom'}) { + $output .= ''."\n"; + } + $output .= "
\n".&Apache::lonhtmlcommon::start_pick_box(); + if ($sincefilterform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cac'}) + .$sincefilterform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($domainselectform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'}) + .$domainselectform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($typeselectform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'}) + .$typeselectform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($instcodeform) { + $output .= &Apache::lonhtmlcommon::row_title($instcodetitle) + .$instcodeform + .&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'ownerfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $ownerdomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'personfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cop'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $persondomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'coursefilter'})) { + $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID')) + .'' + .&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'descriptfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'}) + .'' + .&Apache::lonhtmlcommon::row_closure(1); + } + $output .= &Apache::lonhtmlcommon::end_pick_box(); + $output .= '

'."\n".''."\n".'
'."\n"; + return $jscript.$output; +} + +sub instcode_selectors { + my ($codedom,$formname,$officialjs) = @_; + my ($output,@codetitles,%cat_titles,%cat_order,%cat_items); + my ($jscript,$totcodes,$numtitles,$lasttitle) = + &Apache::courseclassifier::instcode_selectors_data($codedom,$formname, + \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs); + if ($numtitles > 0) { + my $unofficial = ' checked="checked" '; + my $official = ''; + if ($env{'form.official'}) { + $official = $unofficial; + $unofficial = ''; + } + $output .= ''.&mt('Official course:').' '.(' 'x3).'
'. + &Apache::courseclassifier::build_instcode_selectors($numtitles, + $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n". + ''."\n". + ''."\n"; + + } + return ($output,$jscript,$numtitles); +} + +sub search_courses { + my ($r,$type,$onlyown,$filter,$numtitles) = @_; + my (%courses,%showcourses); + if (!$onlyown) { + $r->print(&mt('Searching ...').'
 
'); $r->rflush(); - unless ($descriptfilter) { $descriptfilter='.'; } - unless ($instcodefilter) { $instcodefilter='.'; } - unless ($ownerfilter) { $ownerfilter='.'; } - unless ($coursefilter) { $coursefilter='.'; } - my $timefilter=($sincefilter==-1?1:time-$sincefilter); - my %courses= - &Apache::lonnet::courseiddump - ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter); - $r->print('
'); - my %by_descrip; - my $numcourses = keys(%courses); - foreach my $course (keys(%courses)) { - my $descr; - if ($courses{$course} =~ m/^([^:]*):/i) { - $descr = &Apache::lonnet::unescape($1); - } else { - $descr = &Apache::lonnet::unescape($courses{$course}); + if (($filter->{'ownerfilter'} ne '') || + ($filter->{'ownerdomfilter'} ne '')) { + $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'. + $filter->{'ownerdomfilter'}; + } + foreach my $item ('descriptfilter','coursefilter','combownerfilter') { + if (!$filter->{$item}) { + $filter->{$item}='.'; } - my $description = $descr; - push (@{$by_descrip{$description}}, $course); - } - if ($numcourses > 1 && $multiple) { - $r->print('    -

'); - } - foreach my $description (sort - { lc($a) cmp lc($b) } (keys(%by_descrip))) { - 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(&course_chooser($multiple,$cdom,$cnum,$cleandesc)); - $r->print($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)); + } + my $timefilter = + ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'}); + my ($instcodefilter,$regexpok); + if ($numtitles) { + if ($env{'form.official'}) { + $instcodefilter = + &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'}, + $numtitles); + $regexpok = 1; + } + } else { + $instcodefilter = $filter->{'instcodefilter'}; + } + if ($instcodefilter eq '') { $instcodefilter = '.'; } + if ($type eq '') { $type = '.'; } + %courses = + &Apache::lonnet::courseiddump($filter->{'domainfilter'}, + $filter->{'descriptfilter'}, + $timefilter, + $instcodefilter, + $filter->{'combownerfilter'}, + $filter->{'coursefilter'}, + undef,undef,$type,$regexpok); + if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) { + my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'}, + $filter->{'persondomfilter'}, + 'userroles',undef, + ['cc','in','ad','ep','ta','cr'], + $filter->{'domainfilter'}); + foreach my $role (keys(%rolehash)) { + my ($cnum,$cdom,$courserole) = split(':',$role); + my $cid = $cdom.'_'.$cnum; + if (exists($courses{$cid})) { + if (ref($courses{$cid}) eq 'HASH') { + if (ref($courses{$cid}{roles}) eq 'ARRAY') { + if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { + push (@{$courses{$cid}{roles}},$courserole); + } + } else { + $courses{$cid}{roles} = [$courserole]; + } + $showcourses{$cid} = $courses{$cid}; + } } - if ($multiple) { $r->print("\n"); } - $r->print("
\n"); } - } - if (!%courses) { - $r->print(&mt('None found')); - } elsif ($multiple) { - $r->print(''); - } - $r->print(''."\n". - ''."\n". - ''."\n". - ''."\n"); - if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { - $r->print(''."\n"); + %courses = %showcourses; + } + } else { + $r->print('
'); + my %coursehash = &Apache::loncommon::findallcourses(); + foreach my $cid (sort(keys(%coursehash))) { + $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'}; } - $r->print("
\n"); } - $r->print(&Apache::loncommon::end_page()); - return OK; + return %courses; } sub course_chooser { @@ -342,11 +738,298 @@ sub course_chooser { if ($multiple) { $output = '