--- loncom/interface/lonsearchcat.pm 2023/12/30 03:56:48 1.331.4.16.2.2 +++ loncom/interface/lonsearchcat.pm 2023/12/30 03:45:44 1.359 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.331.4.16.2.2 2023/12/30 03:56:48 raeburn Exp $ +# $Id: lonsearchcat.pm,v 1.359 2023/12/30 03:45:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -308,7 +308,7 @@ END } # if ($env{'form.searchmode'} eq 'advanced') { - my $srchtype = 'Content Library'; + my $srchtype = 'Catalog'; if ($env{'form.area'} eq 'portfolio') { $srchtype = 'Portfolio'; } @@ -442,7 +442,7 @@ sub hidden_field { =pod =over 4 - + =item &print_basic_search_form() Prints the form for the basic search. Sorry the name is so cryptic. @@ -504,7 +504,7 @@ sub setup_basic_search { } else { $singledom = $env{'user.domain'}; $disabled = ' disabled="disabled"'; - $checked = 1; + $checked = 1; } $onlysearchdomain = '
END - my $srchtype = 'Content Library'; + my $srchtype = 'Catalog'; my $jscript; if ($env{'form.area'} eq 'portfolio') { $srchtype = 'Portfolio'; @@ -658,7 +658,7 @@ function additional_metadata() { 'standards','mime') { $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field})) .&Apache::lonmeta::prettyinput($field, - $env{'form.'.$field}, + $env{'form.'.$field},'', $field, 'advsearch', $related_word_search{$field}, @@ -675,7 +675,7 @@ function additional_metadata() { foreach my $field ('lowestgradelevel','highestgradelevel') { $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field})) .&Apache::lonmeta::prettyinput($field, - $env{'form.'.$field}, + $env{'form.'.$field},'', $field, 'advsearch', 0) @@ -690,14 +690,16 @@ function additional_metadata() { my $anydomain = 1; if ($env{'form.area'} ne 'portfolio') { unless (&Apache::lonnet::allowed('bre','/res/')) { - $anydomain = 0; + $anydomain = 0; } } $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))); if ($anydomain) { + my $defdom = &Apache::lonnet::default_login_domain(); + my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom); $scrout .= &Apache::loncommon::domain_select('domains', - $env{'form.domains'},1); + $env{'form.domains'},1,$trusted,$untrusted); } else { $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'}, 'domains','','','',[$env{'user.domain'}],'',1); @@ -708,7 +710,7 @@ function additional_metadata() { if ($env{'form.area'} ne 'portfolio') { $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution'))) .&Apache::lonmeta::selectbox('copyright', - $env{'form.copyright'}, + $env{'form.copyright'},'', \&Apache::loncommon::copyrightdescription, ( undef, &Apache::loncommon::copyrightids) @@ -718,7 +720,7 @@ function additional_metadata() { $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language'))) .&Apache::lonmeta::selectbox('language', - $env{'form.language'}, + $env{'form.language'},'', \&Apache::loncommon::languagedescription, ('any',&Apache::loncommon::languageids) ) @@ -954,12 +956,12 @@ sub viewoptions { $scrout .= '' .&mt('Type:').' ' .&Apache::lonmeta::selectbox('viewselect', - $env{'form.viewselect'}, + $env{'form.viewselect'},'', \&viewoptiontext, sort(keys(%Views))) .''; my $countselect = &Apache::lonmeta::selectbox('show', - $env{'form.show'}, + $env{'form.show'},'', undef, (10,20,50,100,1000,10000)); $scrout .= ' ' @@ -2094,20 +2096,6 @@ sub print_sort_form { &Apache::lonnet::logthis(&Apache::lonmysql::get_error()); return; } - my $js =<