--- loncom/interface/lonmodifycourse.pm	2014/03/13 14:46:46	1.69
+++ loncom/interface/lonmodifycourse.pm	2014/03/17 02:45:25	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.69 2014/03/13 14:46:46 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.70 2014/03/17 02:45:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -153,7 +153,7 @@ sub print_course_search_page {
         $type = 'Course';
     }
     &print_header($r,$type);
-    my ($filterlist,$filter) = &get_filters();
+    my ($filterlist,$filter) = &get_filters($dom);
     my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';
     if ($type eq 'Community') {
@@ -161,7 +161,7 @@ sub print_course_search_page {
     }
     $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     $dctitle = &Apache::lonnet::plaintext('dc');
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     if ($type eq 'Community') {
         $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
     } else {
@@ -169,7 +169,7 @@ sub print_course_search_page {
     }
     $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,
-                                                \@codetitles,$filter->{'domainfilter'}));
+                                                \@codetitles,$dom));
     if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
@@ -197,27 +197,24 @@ sub print_course_selection_page {
     my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');
     my ($numtitles,@codetitles);
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
     $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,
-                                                \@codetitles,$filter->{'domainfilter'},
-                                                $env{'form.form'}));
-    if (ref($filter) eq 'HASH') {
-        $filter->{'domainfilter'} = $dom;
-    }
-    my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,$filter,$numtitles,
-                                                         undef,undef,undef,\@codetitles);
+                                                \@codetitles,$dom,$env{'form.form'}));
+    my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
+                                                     undef,undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);
     return;
 }
 
 sub get_filters {
+    my ($dom) = @_;
     my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
                       'ownerdomfilter','coursefilter','sincefilter');
     # created filter
-    my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'form.domainfilter'});
+    my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom);
     if ($loncaparev ne 'unknown_cmd') {
         push(@filterlist,'createdfilter');
     }