--- loncom/interface/lonpickcourse.pm	2006/12/11 22:20:20	1.61
+++ loncom/interface/lonpickcourse.pm	2009/05/01 01:38:20	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.61 2006/12/11 22:20:20 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.78 2009/05/01 01:38:20 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,7 +50,7 @@ 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);
@@ -72,7 +73,7 @@ sub handler {
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick();
+        $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
 
@@ -83,8 +84,13 @@ sub handler {
     }
 
     my %loaditem;
-    if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
-        $loaditem{'onload'} ="setSections()";
+    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,
@@ -92,7 +98,8 @@ sub handler {
 
     if ($env{'form.form'} eq 'portform') {
         $lastaction = 'document.courselist.submit()';
-    } elsif ($env{'form.form'} eq 'cu') {
+    } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' &&
+        !$multiple)) {
         $lastaction = 
              'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
              'document.courselist.submit();';
@@ -101,8 +108,8 @@ sub handler {
     }
 
     # if called to assign a role in a course to a user via CUSR
-    if ($env{'form.form'} eq 'cu') {
-        $r->print(&create_user_javascript($type)); 
+    if ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') {
+        $r->print(&create_user_javascript($type));
     }
 
     # print javascript functions for choosing a course 
@@ -115,6 +122,7 @@ sub handler {
 # ------------------------------------------ Display of filters to limit search
     my $filter = {};
     my $action = '/adm/pickcourse';
+    my $numtitles;
     if (!$onlyown) {
         my $filterlist = ['domainfilter','descriptfilter',
                           'instcodefilter','ownerfilter',
@@ -125,18 +133,61 @@ sub handler {
             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);
+        my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);
         &display_matched_courses($r,$type,$multiple,$action,%courses);
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
+sub processpick {
+    my $openerform = 'rolechoice';
+    if ($env{'form.form'} eq 'studentform') {
+        $openerform = $env{'form.form'};
+    }
+    my $process_pick = <<"ENDONE";
+<script type="text/javascript">
+function process_pick(dom) {
+    var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+ENDONE
+    if ($openerform eq 'rolechoice') {
+        $process_pick .= <<"ENDTWO";
+    if (pickedDomain == dom) {
+        if (pickedCourse != '') {
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+            opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit();
+        }
+    } 
+    else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+    }
+ENDTWO
+    } else {
+        $process_pick .= <<"ENDTHREE";
+    if (pickedDomain != dom) {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+        return;
+    }
+ENDTHREE
+    }
+    $process_pick .= "
+}
+
+</script>
+";
+    return $process_pick;
+}
+
 sub create_user_javascript {
     my ($type) = @_;
     my $output;
@@ -170,12 +221,40 @@ sub display_matched_courses {
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
+    my $numcourses = keys(%courses);
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
+    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(
+                '<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 ($courses{$course} =~ m/^([^:]*):/i) {
+        if (ref($courses{$course}) eq 'HASH') {
+            $descr = $courses{$course}{'description'};
+        } elsif ($courses{$course} =~ m/^([^:]*):/i) {
             $descr = &unescape($1);
         } else {
             $descr = &unescape($courses{$course});
@@ -183,6 +262,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)" />
@@ -190,29 +270,72 @@ 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>'
+                 );
+        $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,$owner,$ttype) = 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(" - ".&unescape($instcode));
+            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));
             }
-            unless ($owner eq '') {
-                $r->print(", owner - ".&unescape($owner));
+            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));
+            } else {
+                $r->print('&nbsp;');
             }
-            unless ($ttype eq '') {
-                $r->print('('.&unescape($ttype).')');
+            $r->print('</td>');
+            $r->print('<td>'.$ownerstr.'</td>');
+            $r->print('<td>');
+            if ($ttype ne '') {
+                $r->print(&mt(&unescape($ttype)));
+            } else {
+                $r->print('&nbsp;');
             }
+            $r->print('</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) {
@@ -231,19 +354,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('<input type="hidden" name="phase" value="menu" />'."\n");
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form']));
+        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state']));
     } 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" />';
@@ -252,16 +381,15 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $caller) = @_;
+        $numtitlesref) = @_;
     my $list;
     my $formname;
+    my ($fixeddom,$codedom,$jscript);
     if (defined($env{'form.form'})) {
          $formname = $env{'form.form'};
-    } else {
-         $formname = $caller;
     }
     my ($domainselectform,$sincefilterform,$ownerdomselectform,
-        $instcodeform,$typeselectform);
+        $instcodeform,$typeselectform,$instcodetitle);
     foreach my $item (@{$filterlist}) {
         $filter->{$item} = $env{'form.'.$item};
         if ($item ne 'descriptfilter' && $item ne 'instcodefilter') {
@@ -279,8 +407,27 @@ sub build_filters {
             }
         }
         if ($item eq 'domainfilter') {
-            $domainselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);
+	    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 = '<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);
+                $codedom = $filter->{'domainfilter'};
+            }
         } elsif ($item eq 'ownerdomfilter') {
             $ownerdomselectform =
      &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
@@ -306,25 +453,41 @@ 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),
+              'cac' => &mt("$type Activity"),
+              'cde' => &mt("$type Title"),
+              'cdo' => &mt("$type Domain"),
+              'ins' => &mt('Institutional Code'),
+              'inc' => &mt('Institutional Categorization'),
+              'cow' => &mt("$type Owner's Username"),
+              'cod' => &mt("$type Owner's Domain"),
               'cog' => &mt('Course Type')
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    $typeselectform .= ">\n";
+    $typeselectform =  '<select name="type" size="1">'."\n";
     if ($type eq 'Course') {
-        $instcodeform = 
+        if ($env{'form.fixeddom'}) {
+            ($instcodeform,$jscript,$$numtitlesref) = 
+                &instcode_selectors($codedom,'filterpicker');
+        }
+        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.')';
+        }
+        if ($jscript ne '') {
+            $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.
+                       '</script>'."\n";
+        }
     }
     foreach my $posstype ('Course','Non-standard Course') {
-        $typeselectform.='<option value="'.$posstype.'" "'.
-            ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
+        $typeselectform.='<option value="'.$posstype.'"'.
+            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
     }
     $typeselectform.="</select>";
     my $output = qq|
@@ -332,8 +495,10 @@ sub build_filters {
 <input type="hidden" name="form" value="$formname" />
 |;
     if ($formname eq 'modifycourse') {
-        $output .= '<input type="hidden" name="phase" value="courselist" />';
-    } else {     
+        $output .= '<input type="hidden" name="phase" value="courselist" />'."\n".
+                   '<input type="hidden" name="prevphase" value="'.
+                   $env{'form.prevphase'}.'" />'."\n";
+    } else {
         my $name_input;
         if ($env{'form.cnameelement'} ne '') {
             $name_input = '<input type="hidden" name="cnameelement" value="'.
@@ -347,50 +512,81 @@ $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'})
+                  .'<input type="text" name="ownerfilter" size="20" value="'
+                  .$list->{'ownerfilter'}.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title($lt{'cod'})
+                  .$ownerdomselectform
+                  .&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="submit" name="gosearch" value="'. 
+               &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
+    return $jscript.$output;
+}
+
+sub instcode_selectors {
+    my ($codedom,$formname) = @_;
+    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);
+    if ($numtitles > 0) {
+        $output = &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 ($r,$type,$onlyown,$filter,$numtitles) = @_;
     my %courses;
     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 '')) {
@@ -406,19 +602,28 @@ sub search_courses {
         if ($type eq '') { $type = '.'; }
         my $timefilter = 
            ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});
+        my ($instcodefilter,$regexpok);
+        if ($numtitles) {
+            $instcodefilter = 
+                &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},
+                                                               $numtitles);
+            $regexpok = 1;
+        } else {
+            $instcodefilter = $filter->{'instcodefilter'};
+        }
         %courses = 
             &Apache::lonnet::courseiddump($filter->{'domainfilter'},
                                           $filter->{'descriptfilter'},
                                           $timefilter,
-                                          $filter->{'instcodefilter'},
+                                          $instcodefilter,
                                           $filter->{'combownerfilter'},
                                           $filter->{'coursefilter'},
-                                          undef,undef,$type);
+                                          undef,undef,$type,$regexpok);
     } else {
         $r->print('<br />');
         my %coursehash = &Apache::loncommon::findallcourses(); 
         foreach my $cid (sort(keys(%coursehash))) {
-            $courses{$cid} = $env{'course.'.$cid.'.description'};
+            $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'};
         }
     }
     return %courses;
@@ -430,7 +635,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;
@@ -573,7 +778,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).
@@ -646,10 +851,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)>:
 
 
-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).  
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
 
@@ -657,10 +862,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.
 
@@ -682,7 +887,7 @@ Side Effects: None
 X<gochoose_javascript()>
 B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction)>:
 
-Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from Apache::lonroles::processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
+Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
 
 Output: 1  $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags