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