Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.112 and 1.118

version 1.112, 2001/03/22 15:08:49 version 1.118, 2001/03/27 21:50:52
Line 93 Line 93
 # 3/2 Gerd Kortemeyer  # 3/2 Gerd Kortemeyer
 # 3/15 Scott Harrison  # 3/15 Scott Harrison
 # 3/19,3/20 Gerd Kortemeyer  # 3/19,3/20 Gerd Kortemeyer
   # 3/22,3/27 Scott Harrison
   
 package Apache::lonnet;  package Apache::lonnet;
   
Line 1242  sub definerole { Line 1243  sub definerole {
 # ---------------- Make a metadata query against the network of library servers  # ---------------- Make a metadata query against the network of library servers
   
 sub metadata_query {  sub metadata_query {
 <<<<<<< lonnet.pm      my ($query,$custom,$customshow)=@_;
     my ($query,$custom)=@_;      # need to put in a library server loop here and return a hash
     unless ($custom) {  #    for my $server (keys %libserv) {
  my $reply=&reply("querysend:".&escape($query),'msul3');      my %rhash;
  return $reply;      for my $server ('msul3') {
     }   unless ($custom or $customshow) {
     else {      my $reply=&reply("querysend:".&escape($query),$server);
  my $reply=&reply("querysend:".&escape($query).':'.      $rhash{$server}=$reply;
  &escape($customquery),'msul3');      return $reply;
  return $reply;   }
     }   else {
 =======      my $reply=&reply("querysend:".&escape($query).':'.
     my ($query)=@_;       &escape($custom).':'.&escape($customshow),
     # need to put in a loop here and return list       $server);
     my $reply=&reply("querysend:".&escape($query),'msul3');      $rhash{$server}=$reply;
 >>>>>>> 1.111      return $reply;
    }
       }
       return \%rhash;
 }  }
   
 # ------------------------------------------------------------------ Plain Text  # ------------------------------------------------------------------ Plain Text

Removed from v.1.112  
changed lines
  Added in v.1.118


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>