[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

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

version 1.112, 2001/03/22 15:08:49 version 1.121, 2001/04/16 11:46:22
Line 52 Line 52
 # receipt()          : returns a receipt to be given out to users   # receipt()          : returns a receipt to be given out to users 
 # getfile(filename)  : returns the contents of filename, or a -1 if it can't  # getfile(filename)  : returns the contents of filename, or a -1 if it can't
 #                      be found, replicates and subscribes to the file  #                      be found, replicates and subscribes to the file
 # filelocation(dir,file) : returns a farily clean absolute reference to file   # filelocation(dir,file) : returns a fairly clean absolute reference to file 
 #                          from the directory dir  #                          from the directory dir
 # hreflocation(dir,file) : same as filelocation, but for hrefs  # hreflocation(dir,file) : same as filelocation, but for hrefs
 # log(domain,user,home,msg) : write to permanent log for user  # log(domain,user,home,msg) : write to permanent log for user
Line 91 Line 91
 # 09/01,10/01,11/01 Gerd Kortemeyer  # 09/01,10/01,11/01 Gerd Kortemeyer
 # 02/27/01 Scott Harrison  # 02/27/01 Scott Harrison
 # 3/2 Gerd Kortemeyer  # 3/2 Gerd Kortemeyer
 # 3/15 Scott Harrison  # 3/15,3/19 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) {      my %rhash;
  my $reply=&reply("querysend:".&escape($query),'msul3');  #    for my $server (keys %libserv) {
  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;   else {
     }      my $reply=&reply("querysend:".&escape($query).':'.
 =======       &escape($custom).':'.&escape($customshow),
     my ($query)=@_;       $server);
     # need to put in a loop here and return list      $rhash{$server}=$reply;
     my $reply=&reply("querysend:".&escape($query),'msul3');   }
 >>>>>>> 1.111      }
       return \%rhash;
 }  }
   
 # ------------------------------------------------------------------ Plain Text  # ------------------------------------------------------------------ Plain Text
Removed from v.1.112  
changed lines
  Added in v.1.121

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