--- loncom/lonnet/perl/lonnet.pm	2001/03/20 21:33:37	1.110
+++ loncom/lonnet/perl/lonnet.pm	2001/04/16 11:46:22	1.121
@@ -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
@@ -51,7 +52,7 @@
 # receipt()          : returns a receipt to be given out to users 
 # getfile(filename)  : returns the contents of filename, or a -1 if it can't
 #                      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
 # hreflocation(dir,file) : same as filelocation, but for hrefs
 # log(domain,user,home,msg) : write to permanent log for user
@@ -90,8 +91,9 @@
 # 09/01,10/01,11/01 Gerd Kortemeyer
 # 02/27/01 Scott Harrison
 # 3/2 Gerd Kortemeyer
-# 3/15 Scott Harrison
+# 3/15,3/19 Scott Harrison
 # 3/19,3/20 Gerd Kortemeyer
+# 3/22,3/27 Scott Harrison
 
 package Apache::lonnet;
 
@@ -1241,8 +1243,23 @@ sub definerole {
 # ---------------- Make a metadata query against the network of library servers
 
 sub metadata_query {
-    my ($query)=@_;
-    my $reply=&reply("querysend:".&escape($query),'msul3');
+    my ($query,$custom,$customshow)=@_;
+    # need to put in a library server loop here and return a hash
+    my %rhash;
+#    for my $server (keys %libserv) {
+    for my $server ('msul3') {
+	unless ($custom or $customshow) {
+	    my $reply=&reply("querysend:".&escape($query),$server);
+	    $rhash{$server}=$reply;
+	}
+	else {
+	    my $reply=&reply("querysend:".&escape($query).':'.
+			     &escape($custom).':'.&escape($customshow),
+			     $server);
+	    $rhash{$server}=$reply;
+	}
+    }
+    return \%rhash;
 }
 
 # ------------------------------------------------------------------ Plain Text