[LON-CAPA-cvs] cvs: loncom / lond lonsql

[www]

www		Wed Feb  8 12:11:47 2006 EDT

  Modified files:              
    /loncom	lond lonsql 
  Log:
  Prepare to do filtering of lonsql results based on the domain that lond is
  running under
  
  
Index: loncom/lond
diff -u loncom/lond:1.318 loncom/lond:1.319
--- loncom/lond:1.318	Tue Feb  7 11:20:39 2006
+++ loncom/lond	Wed Feb  8 12:11:46 2006
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.318 2006/02/07 16:20:39 albertel Exp $
+# $Id: lond,v 1.319 2006/02/08 17:11:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@
 my $lastlog='';
 my $lond_max_wait_time = 13;
 
-my $VERSION='$Revision: 1.318 $'; #' stupid emacs
+my $VERSION='$Revision: 1.319 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -5146,7 +5146,7 @@
                                       Type    => SOCK_STREAM,
                                       Timeout => 10)
        or return "con_lost";
-    print $sclient "$cmd\n";
+    print $sclient "$cmd:$currentdomainid\n";
     my $answer=<$sclient>;
     chomp($answer);
     if (!$answer) { $answer="con_lost"; }
Index: loncom/lonsql
diff -u loncom/lonsql:1.72 loncom/lonsql:1.73
--- loncom/lonsql:1.72	Tue Feb  7 17:30:31 2006
+++ loncom/lonsql	Wed Feb  8 12:11:46 2006
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.72 2006/02/07 22:30:31 albertel Exp $
+# $Id: lonsql,v 1.73 2006/02/08 17:11:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,6 +388,8 @@
 	    $run = $run+1;
 	    my $userinput = <$client>;
 	    chomp($userinput);
+            $userinput=~s/\:(\w+)$//;
+            my $searchdomain=$1;
             #
 	    my ($conserver,$query,
 		$arg1,$arg2,$arg3)=split(/&/,$userinput);