--- loncom/lonnet/perl/lonnet.pm 2013/08/13 12:48:47 1.1172.2.32 +++ loncom/lonnet/perl/lonnet.pm 2013/09/01 23:24:05 1.1172.2.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1172.2.32 2013/08/13 12:48:47 raeburn Exp $ +# $Id: lonnet.pm,v 1.1172.2.33 2013/09/01 23:24:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -7360,19 +7360,23 @@ sub definerole { # ---------------- Make a metadata query against the network of library servers sub metadata_query { - my ($query,$custom,$customshow,$server_array)=@_; + my ($query,$custom,$customshow,$server_array,$domains_hash)=@_; my %rhash; my %libserv = &all_library(); my @server_list = (defined($server_array) ? @$server_array : keys(%libserv) ); for my $server (@server_list) { + my $domains = ''; + if (ref($domains_hash) eq 'HASH') { + $domains = $domains_hash->{$server}; + } unless ($custom or $customshow) { - my $reply=&reply("querysend:".&escape($query),$server); + my $reply=&reply("querysend:".&escape($query).':::'.&escape($domains),$server); $rhash{$server}=$reply; } else { my $reply=&reply("querysend:".&escape($query).':'. - &escape($custom).':'.&escape($customshow), + &escape($custom).':'.&escape($customshow).':'.&escape($domains), $server); $rhash{$server}=$reply; }