loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.112, 2001/03/22 15:08:49	version 1.117, 2001/03/27 13:37:43
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 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 list
unless ($custom) {	unless ($custom or $customshow) {
my $reply=&reply("querysend:".&escape($query),'msul3');	my $reply=&reply("querysend:".&escape($query),'msul3');
return $reply;	return $reply;
}	}
else {	else {
my $reply=&reply("querysend:".&escape($query).':'.	my $reply=&reply("querysend:".&escape($query).':'.
&escape($customquery),'msul3');	&escape($custom).':'.&escape($customshow),'msul3');
return $reply;	return $reply;
}	}
=======
my ($query)=@_;	my ($query)=@_;
# need to put in a loop here and return list
my $reply=&reply("querysend:".&escape($query),'msul3');	my $reply=&reply("querysend:".&escape($query),'msul3');
>>>>>>> 1.111
}	}

# ------------------------------------------------------------------ Plain Text	# ------------------------------------------------------------------ Plain Text