--- loncom/interface/lonsearchcat.pm 2013/09/02 00:00:49 1.337
+++ loncom/interface/lonsearchcat.pm 2014/01/14 18:54:56 1.341
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.337 2013/09/02 00:00:49 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.341 2014/01/14 18:54:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -52,8 +52,6 @@ search (on a server basis) is displayed
=head1 Internals
-=over 4
-
=cut
###############################################################################
@@ -196,11 +194,14 @@ sub handler {
'Unable to recover data from '.
$persistent_db_file);
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);
+ &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});
return OK;
}
}
@@ -428,8 +429,10 @@ sub hidden_field {
######################################################################
-=pod
+=pod
+=over 4
+
=item &print_basic_search_form()
Prints the form for the basic search. Sorry the name is so cryptic.
@@ -1015,7 +1018,7 @@ This function is the reverse of &make_pe
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.
+commas (before unescaping), the returned value will be an array pointer.
=cut
@@ -1071,7 +1074,7 @@ Store variables away to the %persistent_
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
+concatenated in a comma separated string.
=cut
@@ -2359,7 +2362,7 @@ END
my $major = $1;
my $minor = $2;
if (($major < 2) || (($major == 2) && ($minor < 11))) {
- map { $older_library_servers{$_} = 1; }
+ map { $older_library_servers{$_} = 1; }
&Apache::lonnet::machine_ids($library_servers{$key});
}
}
@@ -2369,7 +2372,7 @@ END
foreach my $server (@Servers_to_contact) {
my %possdoms;
map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server});
- $domains_by_server{$server} =
+ $domains_by_server{$server} =
join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
}
}
@@ -3148,7 +3151,8 @@ SCRIPT
my $start_page = &Apache::loncommon::start_page(undef,$js,
{'only_body' =>1,
- 'add_wishlist' =>1});
+ 'add_wishlist' =>1,
+ 'add_modal' =>1});
my $result=<