--- loncom/interface/lonpickcourse.pm 2009/05/05 05:30:00 1.80 +++ loncom/interface/lonpickcourse.pm 2009/05/08 17:22:17 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.80 2009/05/05 05:30:00 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.81 2009/05/08 17:22:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,6 @@ sub handler { ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', 'multiple','type','setroles','fixeddom']); - my ($type,$title,$jscript,$multelement,$multiple,$roleelement, $lastaction,$autosubmit,$submitopener); @@ -423,12 +422,14 @@ sub multiples_tag { sub build_filters { my ($filterlist,$type,$roleelement,$multelement,$filter,$action, - $numtitlesref) = @_; + $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; } my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform, $instcodeform,$typeselectform,$instcodetitle); @@ -954,10 +955,10 @@ Side Effects: None =item * X -B: +B: -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). +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.