--- loncom/interface/lonsearchcat.pm 2014/02/23 22:16:20 1.331.4.10 +++ loncom/interface/lonsearchcat.pm 2012/12/17 08:29:26 1.333 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.331.4.10 2014/02/23 22:16:20 raeburn Exp $ +# $Id: lonsearchcat.pm,v 1.333 2012/12/17 08:29:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,6 +52,8 @@ search (on a server basis) is displayed =head1 Internals +=over 4 + =cut ############################################################################### @@ -170,7 +172,7 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); my @allowed_searches = ('portfolio'); - if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') { + if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { push(@allowed_searches,'res'); } my $crumb_text = 'Portfolio Search'; @@ -193,15 +195,12 @@ sub handler { &Apache::lonnet::logthis('lonsearchcat:'. 'Unable to recover data from '. $persistent_db_file); - my $msg = - &mt('We were unable to retrieve data describing your search.'). - ' '.&mt('This is a serious error and has been logged.'). - '
'. - &mt('Please alert your LON-CAPA administrator.'); - &Apache::loncommon::simple_error_page( - $r,'Search Error', - $msg, - {'no_auto_mt_msg' => 1}); + my $msg = + 'We were unable to retrieve data describing your search. '. + 'This is a serious error and has been logged. '. + 'Please alert your LON-CAPA administrator.'; + &Apache::loncommon::simple_error_page($r,'Search Error', + $msg); return OK; } } @@ -322,31 +321,31 @@ END &display_results($r,$importbutton,$closebutton,$diropendb, $env{'form.area'}); } elsif ($env{'form.phase'} =~ /^(sort|run_search)$/) { - my ($query,$customquery,$customshow,$libraries,$pretty_string,$domainsref) = + my ($query,$customquery,$customshow,$libraries,$pretty_string) = &get_persistent_data($persistent_db_file, ['query','customquery','customshow', - 'libraries','pretty_string','domains']); + 'libraries','pretty_string']); if ($env{'form.phase'} eq 'sort') { &print_sort_form($r,$pretty_string); } elsif ($env{'form.phase'} eq 'run_search') { &run_search($r,$query,$customquery,$customshow, - $libraries,$pretty_string,$env{'form.area'},$domainsref); + $libraries,$pretty_string,$env{'form.area'}); } } elsif(($env{'form.phase'} eq 'basic_search') || ($env{'form.phase'} eq 'adv_search')) { # # We are running a search, try to parse it - my ($query,$customquery,$customshow,$libraries,$domains) = - (undef,undef,undef,undef,undef); + my ($query,$customquery,$customshow,$libraries) = + (undef,undef,undef,undef); my $pretty_string; if ($env{'form.phase'} eq 'basic_search') { - ($query,$pretty_string,$libraries,$domains) = + ($query,$pretty_string,$libraries) = &parse_basic_search($r,$closebutton,$hidden_fields); return OK if (! defined($query)); &make_persistent({ basicexp => $env{'form.basicexp'}}, $persistent_db_file); } else { # Advanced search - ($query,$customquery,$customshow,$libraries,$pretty_string,$domains) + ($query,$customquery,$customshow,$libraries,$pretty_string) = &parse_advanced_search($r,$closebutton,$hidden_fields); return OK if (! defined($query)); } @@ -354,8 +353,7 @@ END customquery => $customquery, customshow => $customshow, libraries => $libraries, - pretty_string => $pretty_string, - domains => $domains }, + pretty_string => $pretty_string }, $persistent_db_file); # # Set up table @@ -429,9 +427,7 @@ sub hidden_field { ###################################################################### -=pod - -=over 4 +=pod =item &print_basic_search_form() @@ -449,7 +445,7 @@ sub print_basic_search_form { $env{'form.catalogmode'} ne 'import'); my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb; # Search form for resource space - if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') { + if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton); $scrout .= '

'; } @@ -1016,9 +1012,8 @@ Outputs: array of values. Returns undef This function is the reverse of &make_persistent(); Retrieve persistent data from %persistent_db. Retrieved items will have their -values unescaped. If the item is 'domains; then the returned -value will be a hash pointer. Otherwise, if the item contains -commas (before unescaping), the returned value will be an array pointer. +values unescaped. If the item contains commas (before unescaping), the +returned value will be an array pointer. =cut @@ -1036,25 +1031,13 @@ sub get_persistent_data { push @Values, undef; next; } - if ($name eq 'domains') { - my %valueshash; - my @items= map { &unescape($_); } split(',',$persistent_db{$name}); - foreach my $item (@items) { - if ($item =~ /=/) { - my ($key,$val) = map { &unescape($_); } split(/=/,$item); - $valueshash{$key} = $val; - } - } - push(@Values,\%valueshash); + my @values = map { + &unescape($_); + } split(',',$persistent_db{$name}); + if (@values <= 1) { + push @Values,$values[0]; } else { - my @values = map { - &unescape($_); - } split(',',$persistent_db{$name}); - if (@values <= 1) { - push @Values,$values[0]; - } else { - push @Values,\@values; - } + push @Values,\@values; } } untie (%persistent_db); @@ -1072,9 +1055,7 @@ Inputs: Hash of values to save, filename Store variables away to the %persistent_db. Values will be escaped. Values that are array pointers will have their -elements escaped and concatenated in a comma separated string. Values -that are hash pointers will have their keys and values escaped and -concatenated in a comma separated string. +elements escaped and concatenated in a comma separated string. =cut @@ -1086,17 +1067,8 @@ sub make_persistent { return undef if (! tie(%persistent_db,'GDBM_File', $filename,&GDBM_WRCREAT(),0640)); foreach my $name (keys(%save)) { - my @values=(); - if (ref($save{$name}) eq 'ARRAY') { - @values = @{$save{$name}}; - } elsif (ref($save{$name}) eq 'HASH') { - foreach my $key (%{$save{$name}}) { - push(@values,&escape($key).'='.&escape($save{$name}{$key})); - } - } else { - @values = $save{$name}; - } - # We handle array and hash references, but not recursively. + my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name})); + # We handle array references, but not recursively. my $store = join(',', map { &escape($_); } @values ); $persistent_db{$name} = $store; } @@ -1413,8 +1385,7 @@ sub parse_advanced_search { ## ## Deal with restrictions to given domains ## - my ($libraries_to_query,$pretty_domains_string,$domains_to_query) = - &parse_domain_restrictions(); + my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); if ($pretty_domains_string) { $pretty_search_string .= $pretty_domains_string."
\n"; } @@ -1430,12 +1401,11 @@ sub parse_advanced_search { } #&Apache::lonnet::logthis('advanced query = '.$/.$query); return ($query,$customquery,$customshow,$libraries_to_query, - $pretty_search_string,$domains_to_query); + $pretty_search_string); } sub parse_domain_restrictions { my $libraries_to_query = undef; - my $domains_to_query = undef; # $env{'form.domains'} can be either a scalar or an array reference. # We need an array. if (! exists($env{'form.domains'}) || $env{'form.domains'} eq '') { @@ -1459,32 +1429,12 @@ sub parse_domain_restrictions { foreach (sort @allowed_domains) { $pretty_domains_string .= "".$_." "; } - my %library_servers = &Apache::lonnet::get_unique_servers(\@allowed_domains, - 'library'); - my (%older_library_servers,%okdoms,%domains_for_id); - map { $okdoms{$_} = 1; } @allowed_domains; - foreach my $key (keys(%library_servers)) { - if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) { - my $major = $1; - my $minor = $2; - if (($major < 2) || (($major == 2) && ($minor < 11))) { - map { $older_library_servers{$_} = 1; } - &Apache::lonnet::machine_ids($library_servers{$key}); - } else { - my %possdoms; - map { $possdoms{$_}=1 if ($okdoms{$_}); } - &Apache::lonnet::machine_domains($library_servers{$key}); - $domains_for_id{$key} = join(',',sort(keys(%possdoms))); - } - } - } - my %servers = (%library_servers,%older_library_servers); + my %servers = &Apache::lonnet::get_unique_servers(\@allowed_domains, + 'library'); $libraries_to_query = [keys(%servers)]; - $domains_to_query = \%domains_for_id; } return ($libraries_to_query, - $pretty_domains_string, - $domains_to_query); + $pretty_domains_string); } ###################################################################### @@ -1513,8 +1463,7 @@ sub parse_basic_search { $env{"form.$_"}=&unescape($env{"form.$_"}); $env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; } - my ($libraries_to_query,$pretty_domains_string,$domains_to_query) = - &parse_domain_restrictions(); + my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); # # Check to see if enough of a query is filled in my $search_string = $env{'form.basicexp'}; @@ -1560,7 +1509,7 @@ sub parse_basic_search { $pretty_search_string =~ s:^
and ::; &Apache::lonnet::logthis('simple search final query = '.$/.$final_query); return ($final_query,$pretty_search_string, - $libraries_to_query,$domains_to_query); + $libraries_to_query); } @@ -1952,13 +1901,11 @@ sub ensure_db_and_table { ## Sanity check the table id. ## if (! defined($table) || $table eq '' || $table =~ /\D/ ) { - $r->print(&Apache::loncommon::start_page('Error') + $r->print(&Apache::loncommon::start_page(&mt('Error')) +. '

table: |'.$table.'|

' # SB .'

' .&mt('Unable to retrieve search results. ' .'Unable to determine the table results were saved in.') - .'

' - . '

'.&mt('Internal info:').'

' - .'
'.$table.'
' .&Apache::loncommon::end_page() ); return undef; @@ -2090,7 +2037,7 @@ END # $result.="\n"; my $revise = &revise_button(); $result.='

' - .&mt('Total of [quant,_1,match,matches] to your query.',$total_results) + .&mt('There are [_1] matches to your query.',$total_results) .' '.$revise.'

' .'

'.&mt('Search: ').$pretty_query_string .'

'; @@ -2310,7 +2257,7 @@ results into MySQL. ###################################################################### sub run_search { my ($r,$query,$customquery,$customshow,$serverlist, - $pretty_string,$area,$domainsref) = @_; + $pretty_string,$area) = @_; my $tabletype = 'metadata'; if ($area eq 'portfolio') { $tabletype = 'portfolio_search'; @@ -2342,39 +2289,16 @@ END $r->rflush(); # # Determine the servers we need to contact. - my (@Servers_to_contact,%domains_by_server); + my @Servers_to_contact; if (defined($serverlist)) { if (ref($serverlist) eq 'ARRAY') { @Servers_to_contact = @$serverlist; } else { @Servers_to_contact = ($serverlist); } - if (ref($domainsref) eq 'HASH') { - foreach my $server (@Servers_to_contact) { - $domains_by_server{$server} = $domainsref->{$server}; - } - } } else { - my %library_servers = &Apache::lonnet::unique_library(); - my (%all_library_servers, %older_library_servers); - foreach my $key (keys(%library_servers)) { - if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) { - my $major = $1; - my $minor = $2; - if (($major < 2) || (($major == 2) && ($minor < 11))) { - map { $older_library_servers{$_} = 1; } - &Apache::lonnet::machine_ids($library_servers{$key}); - } - } - } - %all_library_servers = (%library_servers,%older_library_servers); + my %all_library_servers = &Apache::lonnet::unique_library(); @Servers_to_contact = sort(keys(%all_library_servers)); - foreach my $server (@Servers_to_contact) { - my %possdoms; - map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server}); - $domains_by_server{$server} = - join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server}))); - } } my %Server_status; # @@ -2444,7 +2368,7 @@ END my $server = shift(@Servers_to_contact); &update_status($r,&mt('contacting [_1]',$server)); my $reply=&Apache::lonnet::metadata_query($query,$customquery, - $customshow,[$server],\%domains_by_server); + $customshow,[$server]); ($server) = keys(%$reply); $Server_status{$server} = $reply->{$server}; } else { @@ -3151,8 +3075,7 @@ SCRIPT my $start_page = &Apache::loncommon::start_page(undef,$js, {'only_body' =>1, - 'add_wishlist' =>1, - 'add_modal' =>1}); + 'add_wishlist' =>1}); my $result=< @@ -3818,6 +3741,7 @@ sub cleanup { &Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db'); } } + &untiehash(); &Apache::lonmysql::disconnect_from_db(); return OK; }