--- loncom/interface/lonpickcourse.pm	2007/12/30 23:22:41	1.68
+++ loncom/interface/lonpickcourse.pm	2009/07/29 22:32:44	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.68 2007/12/30 23:22:41 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.84 2009/07/29 22:32:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::longroup;
+use Apache::courseclassifier;
 use LONCAPA;
 
 sub handler {
@@ -49,23 +50,22 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
-                               'multiple','type','setroles']);
-
+                               'multiple','type','setroles','fixeddom']);
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
         $lastaction,$autosubmit,$submitopener);
 
-    # Get course type - Course or Non-standard Course.
+    # Get course type - Course or Community.
     $type = $env{'form.type'};
     if (!defined($env{'form.type'})) {
         $type = 'Course';
     }
-    $title = &mt('Selecting a [_1]',$type);
+    $title = 'Selecting a '.$type;
 
     # Setup for multiple course selections, if flag for multiples set.
     $multiple = $env{'form.multiple'};
     if ($multiple) {
         ($jscript,$multelement) = &multiples_tag();
-        $title = &mt('Selecting [_1](s)',lc($type));
+        $title = 'Selecting '.$type.'(s)';
     }
 
     # if called when a DC is selecting a course 
@@ -83,9 +83,15 @@ sub handler {
     }
 
     my %loaditem;
+    if (($env{'form.type'} eq 'Course') && ($env{'form.numtitles'})) {
+        if (($env{'form.official'} eq 'on') && ($env{'form.state'} eq 'listing')) {
+            $loaditem{'onload'} = 'setElements(document.filterpicker); ';
+        }
+    }
+
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} ="setSections()";
+            $loaditem{'onload'} .= 'setSections()';
     }
     $r->print(&Apache::loncommon::start_page($title,undef,
 					     {'add_entries' => \%loaditem,
@@ -108,32 +114,53 @@ sub handler {
     }
 
     # print javascript functions for choosing a course 
-    if ($env{'form.gosearch'} || $onlyown) {
+    if (($env{'form.command'} eq 'gosearch') || $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }
-    $r->print('<script type="text/javascript">'.$jscript.'</script>');
+    $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
+              '</script>');
     $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','ownerfilter',
-                          'ownerdomfilter'];
+                          '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));
+                                 $filter,$action,\$numtitles));
     }
 
 # ---------------------------------------------------------------- Get the data
-    if ($env{'form.gosearch'} || $onlyown) {
-        my %courses = &search_courses($r,$type,$onlyown,$filter);
-        &display_matched_courses($r,$type,$multiple,$action,%courses);
+    if (($env{'form.command'} eq 'gosearch') || $onlyown) {
+        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);
+        if ($nohost) {
+            $r->print ('<span class="LC_warning">'.
+                       &mt('User does not exist - username: [_1], domain: [_2].',
+                           '<b>'.$filter->{'personfilter'}.'</b>',
+                           '<b>'.$filter->{'persondomfilter'}.'</b>').'</span>');
+        } else {
+            &display_matched_courses($r,$type,$multiple,$action,$showroles,%courses);
+        }
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -211,7 +238,7 @@ function setSections() {
 }
 
 sub display_matched_courses {
-    my ($r,$type,$multiple,$action,%courses) = @_;
+    my ($r,$type,$multiple,$action,$showroles,%courses) = @_;
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
@@ -228,18 +255,22 @@ sub display_matched_courses {
                  $menuchk = ' checked="checked" ';
             }
             $r->print(
-                '<span class="LC_nobreak"><label>'.
-                '<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'.
-                '&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle).
-                '</label>'.('&nbsp;'x3).'</span><br />'.
-                '<span class="LC_nobreak"><label>'.
-                '<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'.
-                &mt('View or modify course settings which only a [_1] may modify.',$dctitle).
-                '</label></span><br /><br />');
+                '<fieldset>'
+               .'<legend>'.&mt('Action').'</legend>'
+               .'<div class="LC_nobreak"><label>'
+               .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
+               .'&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle)
+               .'</label></div>'
+               .'<div class="LC_nobreak"><label>'
+               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'
+               .&mt('View or modify course settings which only a [_1] may modify.',$dctitle)
+               .'</label></div>'
+               .'</fieldset>'
+               .'<br />'
+            );
         }
     }
     my %by_descrip;
-    my $numcourses = keys(%courses);
     foreach my $course (keys(%courses)) {
         my $descr;
         if (ref($courses{$course}) eq 'HASH') {
@@ -252,6 +283,7 @@ sub display_matched_courses {
         my $description = $descr;
         push (@{$by_descrip{$description}}, $course);
     }
+ 
     if ($numcourses > 1 && $multiple) {
         $r->print('<input type="button" value="check all"
                   onclick="javascript:checkAll(document.courselist.course_id)" />
@@ -259,8 +291,27 @@ sub display_matched_courses {
                   onclick="javascript:uncheckAll(document.courselist.course_id)" />
                   <br /><br />');
     }
+
+    if (%courses) {
+        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_data_table_header_row());
+        $r->print('<th>'.&mt('Select').'</th>'
+                 .'<th>'.&mt('Course Title').'</th>'
+                 .'<th>'.&mt('Domain').'</th>'
+                 .'<th>'.&mt('Course Code').'</th>'
+                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
+                 .'<th>'.&mt('Type').'</th>'
+                 );
+        if ($showroles) {
+            $r->print('<th>'.&mt("Role(s) for [_1]",
+                &Apache::loncommon::plainname($env{'form.personfilter'},
+                                              $env{'form.persondomfilter'},'firstname')).'</th>');
+        }
+        $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);
@@ -280,26 +331,54 @@ sub display_matched_courses {
                 ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
                 push(@owners,&unescape($singleowner));
             }
-            my $owner = join(', ',@owners);
-            $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
-            $r->print($description.' ('.
-                      (&Apache::lonnet::domain($cdom,'description')?
-                       &Apache::lonnet::domain($cdom,'description'):$cdom).")");
+            my $ownerstr = join(', ',@owners);
+            $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc).'</td>');
+            $r->print('<td>'.$description.'</td>');
+            $r->print('<td>');
+            $r->print(&Apache::lonnet::domain($cdom,'description')?
+                      $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
+            $r->print('</td>');
+            $r->print('<td>');
             if ($instcode ne '') {
-                $r->print(" - ".&unescape($instcode));
-            }
-            if (@owners > 1) {
-                $r->print(', '.&mt('owners').' - ',join(', ',@owners)); 
-            } elsif (@owners == 1) {
-                $r->print(', '.&mt('owner').' - '.$owner);
+                $r->print(&unescape($instcode));
+            } else {
+                $r->print('&nbsp;');
             }
+            $r->print('</td>');
+            $r->print('<td>'.$ownerstr.'</td>');
+            $r->print('<td>');
             if ($ttype ne '') {
-                $r->print(' ('.&unescape($ttype).')');
+                $r->print(&mt(&unescape($ttype)));
+            } else {
+                $r->print('&nbsp;');
+            }
+            $r->print('</td>');
+            if ($showroles) {
+                $r->print('<td>');
+                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.'</td>');
             }
             if ($multiple) { $r->print("</label>\n"); }
-            $r->print("<br />\n");
+            $r->print(&Apache::loncommon::end_data_table_row());
+            # $r->print("<br />\n");
         }
     }
+    if (%courses) {
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+
     if (!%courses) {
         $r->print(&mt('None found'));
     } elsif ($multiple) {
@@ -318,18 +397,25 @@ sub display_matched_courses {
         $r->print('<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />');
         $r->print('<input type="hidden" name="action" value="rolepicker" />');
     } elsif ($env{'form.form'} eq 'modifycourse') {
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form']));
+        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state','command']));
     } else {
         $r->print('<input type="hidden" name="cnumelement" value="'.
                   $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");
     }
+    if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
+        $r->print('<input type="hidden" name="fixeddom" value="'.
+                  $env{'form.fixeddom'}.'" />');
+    }
+    if ($env{'form.numtitles'}) {
+        $r->print('<input type="hidden" name="numtitles" value="'.
+                  $env{'form.numtitles'}.'" />');
+    }
     $r->print("</form>\n");
     return;
 }
 
-
 sub multiples_tag {
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     my $multelement = '<input type="hidden" name="multiple" value="1" />';
@@ -338,25 +424,48 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $caller) = @_;
+        $numtitlesref,$caller) = @_;
     my $list;
     my $formname;
+    my ($fixeddom,$codedom,$jscript);
     if (defined($env{'form.form'})) {
-         $formname = $env{'form.form'};
+        $formname = $env{'form.form'};
     } else {
-         $formname = $caller;
+        $formname = $caller;
     }
-    my ($domainselectform,$sincefilterform,$ownerdomselectform,
-        $instcodeform,$typeselectform);
+    my $onchange;
+    unless ($env{'form.interface'} eq 'textual') {
+        $onchange = 1;
+    }
+    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' || $item eq 'ownerdomfilter') {
+	    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.command'} eq '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;
 	    }
@@ -373,13 +482,19 @@ sub build_filters {
                 $filter->{$item} ||= $env{'request.role.domain'};
                 $allow_blank=0;
             }
-            $domainselectform =
-		&Apache::loncommon::select_dom_form($filter->{$item},
-						    'domainfilter',
-						    $allow_blank);
-        } elsif ($item eq 'ownerdomfilter') {
-            $ownerdomselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
+            if ($env{'form.fixeddom'}) {
+                $domainselectform = '<input type="hidden" name="domainfilter"'.
+                                    'value="'.$env{'request.role.domain'}.'" />'.
+                                    &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,'',$onchange);
+                $codedom = $filter->{'domainfilter'};
+            }
         } else {
             $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"');
         }
@@ -402,28 +517,59 @@ sub build_filters {
                       '15552000','31104000']));
 
     my %lt = (
-              'cac' => &mt('[_1] Activity',$type),
-              'cde' => &mt('[_1] Description',$type),
-              'cdo' => &mt('[_1] Domain',$type),
-              'cin' => &mt('Course Institutional Code'),
-              'cow' => &mt("[_1] Owner's Username",$type),
-              'cod' => &mt("[_1] Owner's Domain", $type),
-              'cog' => &mt('Course Type')
+              '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('Type')
              );
 
-    $typeselectform =  '<select name="type" size="1">'."\n";
+    $typeselectform =  '<select name="type" size="1"';
+    if ($onchange) {
+        $typeselectform .= 'onchange=" javascript:submit()"';
+    }
+    $typeselectform .= '>'."\n";
+    my $officialjs;
     if ($type eq 'Course') {
-        $instcodeform = 
+        if (($env{'form.fixeddom'}) || ($env{'form.form'} eq 'requestcrs')) {
+            $officialjs = 1;
+            ($instcodeform,$jscript,$$numtitlesref) = 
+                &instcode_selectors($codedom,'filterpicker',$officialjs);
+        }
+        if ($instcodeform eq '') {
+            $instcodeform = 
                 '<input type="text" name="instcodefilter" size="10" value="'.
                 $list->{'instcodefilter'}.'" />';
+            $instcodetitle = $lt{'ins'};
+        } else {
+            $instcodetitle = $lt{'inc'};
+        }
+        if ($env{'form.fixeddom'}) {
+            $instcodetitle .= '<br />('.$codedom.')';
+        }
     }
-    foreach my $posstype ('Course','Non-standard Course') {
-        $typeselectform.='<option value="'.$posstype.'" "'.
-            ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
+    $jscript .= <<"END_JS";
+
+function setCommand() {
+    document.filterpicker.command.value = 'gosearch';
+    return;
+}
+
+END_JS
+
+    $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.
+               '</script>'."\n";
+
+    foreach my $posstype ('Course','Community') {
+        $typeselectform.='<option value="'.$posstype.'"'.
+            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
     }
     $typeselectform.="</select>";
     my $output = qq|
-<form method="post" name="filterpicker" action="$action">
+<form method="post" name="filterpicker" action="$action" onsubmit="setCommand()">
 <input type="hidden" name="form" value="$formname" />
 |;
     if ($formname eq 'modifycourse') {
@@ -444,73 +590,162 @@ $roleelement
 $multelement
 |;
         if ($formname eq 'portform') {
-            $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />';
+            $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
         }
     }
+    if ($env{'form.fixeddom'}) { 
+        $output .= '<input type="hidden" name="fixeddom" value="'.$env{'form.fixeddom'}.'" />'."\n";
+    }
+    $output .= "<br />\n".&Apache::lonhtmlcommon::start_pick_box();
     if ($sincefilterform) { 
-        $output .= $lt{'cac'}.': '.$sincefilterform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cac'})
+                  .$sincefilterform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if ($domainselectform) {
-        $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
-    }
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'})
+                  .$domainselectform
+                  .&Apache::lonhtmlcommon::row_closure();
+    } 
     if ($typeselectform) {
-        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                  .$typeselectform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if ($instcodeform) {
-        $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
+                  .$instcodeform
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'ownerfilter'})) {
-        $output .= $lt{'cow'}.': '.
-                   '<input type="text" name="ownerfilter" size="10" value="'.
-                   $list->{'ownerfilter'}.'" /><br />'."\n".
-                   $lt{'cod'}.': '.$ownerdomselectform.'<br />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}).
+                   '<table><tr><td>'.&mt('Username').'<br />'.
+                   '<input type="text" name="ownerfilter" size="20" value="'.
+                   $list->{'ownerfilter'}.'" /></td><td>'.&mt('Domain').'<br />'.
+                   $ownerdomselectform.'</td></tr></table>'.
+                   &Apache::lonhtmlcommon::row_closure();
+    }
+    if (exists($filter->{'personfilter'})) {
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cop'}).
+                   '<table><tr><td>'.&mt('Username').'<br />'.
+                   '<input type="text" name="personfilter" size="20" value="'.
+                   $list->{'personfilter'}.'" /></td><td>'.&mt('Domain').'<br />'.
+                   $persondomselectform.'</td></tr></table>'.
+                   &Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'coursefilter'})) {
-        $output .= &mt('LON-CAPA course ID').': '.
-                   '<input type="text" name="coursefilter" size="25" value="'.
-                    $list->{'coursefilter'}.'" /><br />';
+        $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID'))
+                  .'<input type="text" name="coursefilter" size="25" value="'
+                  .$list->{'coursefilter'}.'" />'
+                  .&Apache::lonhtmlcommon::row_closure();
     }
     if (exists($filter->{'descriptfilter'})) {
-        $output .=$lt{'cde'}.': '.
-                  '<input type="text" name="descriptfilter" size="40" value="'.
-                  $list->{'descriptfilter'}.'" />'."\n";
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'})
+                  .'<input type="text" name="descriptfilter" size="40" value="'
+                  .$list->{'descriptfilter'}.'" />'
+                  .&Apache::lonhtmlcommon::row_closure(1);
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box();
+    $output .= '<p><input type="hidden" name="command" value="">'."\n".
+               '<input type="submit" name="gosearch" value="'. 
+               &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\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 $official = ' checked="checked" ';
+        my $unofficial = '';
+        if ($env{'form.official'} eq 'off') {
+            $unofficial = $official;
+            $official = '';
+        }
+        $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
+                   '<input type="radio" name="official" value="on"'.$official.' />'.
+                   &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
+                   '<input type="radio" name="official" value="off"'.$unofficial.
+                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
+                   &Apache::courseclassifier::build_instcode_selectors($numtitles,
+                   $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n".
+                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
+                   '<input type="hidden" name="state" value="listing" />'."\n";
+ 
     }
-    $output .= qq|
-<p><input type="submit" name="gosearch" value="Search" /></p>
-</form>
-<hr />
-|;
-    return $output; 
+    return ($output,$jscript,$numtitles);
 }
 
 sub search_courses {
-    my ($r,$type,$onlyown,$filter) = @_;
-    my %courses;
+    my ($r,$type,$onlyown,$filter,$numtitles) = @_;
+    my (%courses,%showcourses);
     if (!$onlyown) {
-        $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
+        $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
         if (($filter->{'ownerfilter'} ne '') ||
             ($filter->{'ownerdomfilter'} ne '')) {
             $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'.
                                            $filter->{'ownerdomfilter'};
         }
-        foreach my $item ('descriptfilter','instcodefilter','coursefilter',
-                          'combownerfilter') {
+        foreach my $item ('descriptfilter','coursefilter','combownerfilter') {
             if (!$filter->{$item}) {
                 $filter->{$item}='.';
             }
         }
-        if ($type eq '') { $type = '.'; }
         my $timefilter = 
            ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});
+        my ($instcodefilter,$regexpok);
+        if ($numtitles) {
+            if ($env{'form.official'} eq 'on') {
+                $instcodefilter = 
+                    &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                $regexpok = 1;
+            } elsif ($env{'form.official'} eq 'off') {
+                $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                unless ($instcodefilter eq '') {
+                    $regexpok = -1;
+                }
+            }
+        } else {
+            $instcodefilter = $filter->{'instcodefilter'};
+        }
+        if ($instcodefilter eq '') { $instcodefilter = '.'; }
+        if ($type eq '') { $type = '.'; }
         %courses = 
             &Apache::lonnet::courseiddump($filter->{'domainfilter'},
                                           $filter->{'descriptfilter'},
                                           $timefilter,
-                                          $filter->{'instcodefilter'},
+                                          $instcodefilter,
                                           $filter->{'combownerfilter'},
                                           $filter->{'coursefilter'},
-                                          undef,undef,$type);
+                                          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};
+                    }
+                }
+            }
+            %courses = %showcourses;
+        }
     } else {
         $r->print('<br />');
         my %coursehash = &Apache::loncommon::findallcourses(); 
@@ -527,7 +762,7 @@ sub course_chooser {
     if ($multiple) {
         $output = '<label><input type="checkbox" name="course_id" value="'.$cdom.'_'.$cnum.'" />'."\n";
     } else {
-        $output = '<input type="button" value="Select" onClick="gochoose('.
+        $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
     }
     return $output;
@@ -541,7 +776,7 @@ sub gochoose_javascript {
                                  total => 'coursetotal',
                                  list  => 'courselist',
                                  },
-                     'Non-standard Course' => {
+                     'Community' => {
                                  name  => 'grouppick',
                                  total => 'grouptotal',
                                  list  => 'grouplist',
@@ -658,7 +893,7 @@ Course Activity - how recently was cours
 Course Domain - the domain of the course
 
 =item *
-Course Type - Course or Non-standard Course
+Type - Course or Community
 
 =item *
 Course Institutional Code - the institutional identifier assigned to the course
@@ -670,7 +905,7 @@ Course Owner's Username - the username o
 Course Owner's Domain - the domain of the owner of the course
 
 =item * 
-Course Description - text which appears in the Course Description (or title), as set in the Course Parameters.
+Course Title - text which appears in the Course Title, as set in the Course Parameters.
 
 =item *
 Course ID - the internal course number (course ID part after initial 'domain_') used by LON-CAPA (this criterion is only displayed to Domain Coordinators selecting a course in the same domain as their DC role).
@@ -711,7 +946,7 @@ Following selection, and/or submission,
 X<create_user_javascript()>
 B<create_user_javascript($type)>:
 
-Input: 1 - $type  - the course type - Course or Non-standard Course
+Input: 1 - $type  - the course type - Course or Community
 
 Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags 
 
@@ -722,9 +957,9 @@ javascript code for reporting selected s
 
 =item *
 X<display_matched_courses()>
-B<display_matched_courses($r,$type,$multiple,$action,%courses)>:
+B<display_matched_courses($r,$type,$multiple,$action,$showroles,%courses)>:
 
-Input: 5 - request object, course type, multiple (0 or 1), form action; hash of courses.
+Input: 7 - request object, course type, multiple (0 or 1), form action, whether to show roles (for course personnel filter), hash of courses.
 
 Output: 0
 
@@ -743,10 +978,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller)>:
 
 
-Input: 6 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action.
+Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm).
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
 
@@ -754,10 +989,10 @@ Side Effects: None
 
 =item *
 X<search_courses()>
-B<search_courses($r,$type,$onlyown,$filter)>:
+B<search_courses($r,$type,$onlyown,$filter,$numtitles)>:
 
 
-Input: 5 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values.
+Input: 5 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories).  
 
 Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -819,6 +1054,10 @@ javascript functions used when user sele
 
 (g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes.
 
+=item
+
+(h) User requesting creation of a course, and selecting a course to clone - course number and domain written to visible form elements in opener window. Child window closes.
+
 =back
      
 =cut