--- loncom/interface/lonpickcourse.pm	2006/08/11 22:14:10	1.50.2.2
+++ loncom/interface/lonpickcourse.pm	2006/07/03 04:00:34	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.50.2.2 2006/08/11 22:14:10 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.51 2006/07/03 04:00:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@ sub handler {
 			       'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter',
                                'ownerfilter','coursefilter','multiple',
-                               'type','ownerdomfilter']);
+                               'type']);
 # domain filter and selection
     my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -70,13 +70,8 @@ sub handler {
     my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
 # course owner filter
     my $ownerfilter=$env{'form.ownerfilter'};
-    $ownerfilter=~s/\W//g;
+    unless ($ownerfilter) { $ownerfilter=''; }
     my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
-# course ownerdomain filter
-    my $ownerdomfilter=$env{'form.ownerdomfilter'};
-    $ownerdomfilter=~s/\W//g;
-    my $ownerdomselectform=
-       &Apache::loncommon::select_dom_form($ownerdomfilter,'ownerdomfilter',1);
 # course ID filter for DCs only
     my ($courseidtag,$coursefilter);
     if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'.
@@ -248,7 +243,6 @@ function setGroups() {
 	      '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 or Group')
              );
    
@@ -281,6 +275,7 @@ function setGroups() {
         $instcodeform = $lt{'cin'}.': <input type="text" name="instcodefilter" 
  size="10" value="'.$listinstcode.'" /><br />';
     }
+
     my %elements = (
                      Course => {
                                  name  => 'coursepick',
@@ -401,15 +396,13 @@ $multelement
 $lt{'cac'}: $sincefilterform
 <br />
 $lt{'cdo'}: $domainselectform
-<!-- <br />
- $lt{'cog'}: $typeselectform -->
+<br />
+$lt{'cog'}: $typeselectform
 <br />
 $instcodeform
 $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />
-$lt{'cod'}: $ownerdomselectform
-<br />
 $courseidtag
 $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />
@@ -423,17 +416,13 @@ ENDSCRIPT
         $r->rflush();
 	unless ($descriptfilter) { $descriptfilter='.'; }
         unless ($instcodefilter) { $instcodefilter='.'; }
-        my $combownerfilter;
-        if (($ownerfilter ne '') || ($ownerdomfilter ne '')) {
-            $combownerfilter = $ownerfilter.':'.$ownerdomfilter;
-        }
-        if ($combownerfilter eq '') { $combownerfilter='.'; }
-        if ($coursefilter eq '') { $coursefilter='.'; }
-        if ($type eq '') { $type = '.'; }
+        unless ($ownerfilter) { $ownerfilter='.'; }
+        unless ($coursefilter) { $coursefilter='.'; }
+        unless ($type) { $type = '.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);
-	my %courses = &Apache::lonnet::courseiddump($domainfilter,$descriptfilter,
-                                     $timefilter,$instcodefilter,$combownerfilter,
-                                     $coursefilter,undef,undef,$type);
+	my %courses=
+	    &Apache::lonnet::courseiddump
+	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter,undef,undef,$type);
 	$r->print('<form name="courselist" method="post" action="/adm/pickcourse">');
 	my %by_descrip;
         my $numcourses = keys(%courses);