--- loncom/interface/lonsearchcat.pm 2009/07/31 16:01:48 1.313 +++ loncom/interface/lonsearchcat.pm 2010/05/04 15:21:26 1.322 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.313 2009/07/31 16:01:48 bisitz Exp $ +# $Id: lonsearchcat.pm,v 1.322 2010/05/04 15:21:26 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,8 +118,6 @@ sub handler { # This is set and used in &handler() and is also used in # &output_results(). - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } # my $closebutton; # button that closes the search window # This button is different for the RAT compared to @@ -268,23 +266,23 @@ sub handler { if ($env{'form.catalogmode'} eq 'interactive') { $closebutton=" +onclick='javascript:select_group()' /> END } else { $closebutton = ''; @@ -324,7 +322,7 @@ END &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). '&phase=disp_adv'. - 'catalogmode='.$env{'form.catalogmode'}. + '&catalogmode='.$env{'form.catalogmode'}. '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}, text=>"Course Search", @@ -492,7 +490,7 @@ sub course_search { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). '&phase=disp_adv'. - 'catalogmode='.$env{'form.catalogmode'}. + '&catalogmode='.$env{'form.catalogmode'}. '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}, text=>"Course Search", @@ -770,14 +768,26 @@ sub setup_basic_search { portfolio => 'Portfolio Search', ); my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout); - $userelatedwords = ''; - $onlysearchdomain = ''; + + $userelatedwords = ''; + + $onlysearchdomain = ''; + $adv_search_link = ' $closebutton +
END my $srchtype = 'Catalog'; my $jscript; @@ -878,20 +890,28 @@ function additional_metadata() { } my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search", $jscript); - $scrout .= <<"ENDHEADER"; -$bread_crumb -'; + $scrout .= &Apache::loncommon::end_page(); $r->print($scrout); return; @@ -1703,7 +1733,7 @@ sub parse_domain_restrictions { foreach (sort @allowed_domains) { $pretty_domains_string .= "".$_." "; } - my %servers = &Apache::lonnet::get_servers(\@allowed_domains, + my %servers = &Apache::lonnet::get_unique_servers(\@allowed_domains, 'library'); $libraries_to_query = [keys(%servers)]; } @@ -2561,7 +2591,7 @@ END @Servers_to_contact = ($serverlist); } } else { - my %all_library_servers = &Apache::lonnet::all_library(); + my %all_library_servers = &Apache::lonnet::unique_library(); @Servers_to_contact = sort(keys(%all_library_servers)); } my %Server_status; @@ -3521,7 +3551,7 @@ sub detailed_citation_view { $result .= ''.&mt($field->{'translate'}).''; foreach my $item (split(',',$values{$field->{'name'}})){ $item = &Apache::lonnet::clutter($item); - $result .= &display_url($item,[2,0,1]); + $result .= ''.$closebutton.'
$errormsg
$end_page ENDPAGE