--- loncom/lonsql	2006/02/07 05:08:27	1.70
+++ loncom/lonsql	2006/02/08 21:17:53	1.74
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.70 2006/02/07 05:08:27 raeburn Exp $
+# $Id: lonsql,v 1.74 2006/02/08 21:17:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,12 +260,14 @@ if (-e $pidfile) {
 # Read hosts file
 #
 my $thisserver;
+my %hostname;
 my $PREFORK=4; # number of children to maintain, at least four spare
 open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
 while (my $configline=<CONFIG>) {
     my ($id,$domain,$role,$name)=split(/:/,$configline);
     $name=~s/\s//g;
     $thisserver=$name if ($id eq $perlvar{'lonHostID'});
+    $hostname{$id}=$name;
     #$PREFORK++;
 }
 close(CONFIG);
@@ -386,6 +388,8 @@ sub make_new_child {
 	    $run = $run+1;
 	    my $userinput = <$client>;
 	    chomp($userinput);
+            $userinput=~s/\:(\w+)$//;
+            my $searchdomain=$1;
             #
 	    my ($conserver,$query,
 		$arg1,$arg2,$arg3)=split(/&/,$userinput);
@@ -424,7 +428,7 @@ sub make_new_child {
                 }
                 # end of log query
             } elsif (($query eq 'fetchenrollment') || 
-                                           ($query eq 'institutionalphotos')) {
+		     ($query eq 'institutionalphotos')) {
                 # retrieve institutional class lists
                 my $dom = &unescape($arg1);
                 my %affiliates = ();
@@ -462,7 +466,7 @@ sub make_new_child {
                 }
             } else {
                 # Do an sql query
-                $result = &do_sql_query($query,$arg1,$arg2);
+                $result = &do_sql_query($query,$arg1,$arg2,$searchdomain);
             }
             # result does not need to be escaped because it has already been
             # escaped.
@@ -513,8 +517,18 @@ sub process_file {
 }
 
 sub do_sql_query {
-    my ($query,$custom,$customshow) = @_;
-#    &logthis('doing query '.$query);
+    my ($query,$custom,$customshow,$searchdomain) = @_;
+
+#
+# limit to searchdomain if given and table is metadata
+#
+    if (($searchdomain) && ($query=~/FROM metadata/)) {
+	$query.=' HAVING (domain="'.$searchdomain.'")';
+    }
+#    &logthis('doing query ('.$searchdomain.')'.$query);
+
+
+
     $custom     = &unescape($custom);
     $customshow = &unescape($customshow);
     #
@@ -658,12 +672,12 @@ Returns: The results of the message or '
 ########################################################
 sub subreply {
     my ($cmd,$server)=@_;
-    my $peerfile="$perlvar{'lonSockDir'}/$server";
+    my $peerfile="$perlvar{'lonSockDir'}/".$hostname{$server};
     my $sclient=IO::Socket::UNIX->new(Peer    =>"$peerfile",
                                       Type    => SOCK_STREAM,
                                       Timeout => 10)
        or return "con_lost";
-    print $sclient "$cmd\n";
+    print $sclient "sethost:$server:$cmd\n";
     my $answer=<$sclient>;
     chomp($answer);
     $answer="con_lost" if (!$answer);