loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

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

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

version 1.111, 2001/03/22 13:29:05	version 1.112, 2001/03/22 15:08:49
Line 3	Line 3
#	#
# Functions for use by content handlers:	# Functions for use by content handlers:
#	#
# metadata_query(sql-query-string) : returns file handle of where sql	# metadata_query(sql-query-string,custom-metadata-regex) :
# results will be stored for query	# returns file handle of where sql and
	# regex results will be stored for query
# plaintext(short) : plain text explanation of short term	# plaintext(short) : plain text explanation of short term
# fileembstyle(ext) : embed style in page for file extension	# fileembstyle(ext) : embed style in page for file extension
# filedescription(ext) : descriptor text for file extension	# filedescription(ext) : descriptor text for file extension
Line 1241 sub definerole {	Line 1242 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)=@_;
	unless ($custom) {
	my $reply=&reply("querysend:".&escape($query),'msul3');
	return $reply;
	}
	else {
	my $reply=&reply("querysend:".&escape($query).':'.
	&escape($customquery),'msul3');
	return $reply;
	}
	=======
my ($query)=@_;	my ($query)=@_;
# need to put in a loop here and return list	# 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

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

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