--- loncom/lond	2007/01/28 18:49:49	1.359
+++ loncom/lond	2007/03/28 20:28:29	1.364
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.359 2007/01/28 18:49:49 raeburn Exp $
+# $Id: lond,v 1.364 2007/03/28 20:28:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.359 $'; #' stupid emacs
+my $VERSION='$Revision: 1.364 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1268,6 +1268,7 @@ sub du_handler {
 	my $code=sub { 
 	    if ($_=~/\.\d+\./) { return;} 
 	    if ($_=~/\.meta$/) { return;}
+	    if (-d $_)         { return;}
 	    $total_size+=(stat($_))[7];
 	};
 	chdir($ududir);
@@ -3599,7 +3600,7 @@ sub get_domain_handler {
 
     return 1;
 }
-&register_handler("getdom", \&get_id_handler, 0, 1, 0);
+&register_handler("getdom", \&get_domain_handler, 0, 1, 0);
 
 
 #
@@ -4630,6 +4631,31 @@ sub student_photo_handler {
 }
 &register_handler("studentphoto", \&student_photo_handler, 0, 1, 0);
 
+sub inst_usertypes_handler {
+    my ($cmd, $domain, $client) = @_;
+    my $res;
+    my $userinput = $cmd.":".$domain; # For logging purposes.
+    my (%typeshash,@order);  
+    if (&localenroll::inst_usertypes($domain,\%typeshash,\@order) eq 'ok') {
+        if (keys(%typeshash) > 0) {
+            foreach my $key (keys(%typeshash)) {
+                $res.=&escape($key).'='.&escape($typeshash{$key}).'&';
+            }
+        }
+        $res=~s/\&$//;
+        $res .= ':';
+        if (@order > 0) {
+            foreach my $item (@order) {
+                $res .= &escape($item).'&';
+            }
+        }
+        $res=~s/\&$//;
+    }
+    &Reply($client, "$res\n", $userinput);
+    return 1;
+}
+&register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);
+
 # mkpath makes all directories for a file, expects an absolute path with a
 # file or a trailing / if just a dir is passed
 # returns 1 on success 0 on failure
@@ -5283,15 +5309,36 @@ sub reconlonc {
     }
 }
 
-# -------------------------------------------------- Non-critical communication
+sub create_connection {
+    my ($hostname,$lonid) = @_;
+    my $client=IO::Socket::UNIX->new(Peer    => $perlvar{'lonSockCreate'},
+				     Type    => SOCK_STREAM,
+				     Timeout => 10);
+    return 0 if (!$client);
+    print $client ("$hostname:$lonid\n");
+    my $result = <$client>;
+    chomp($result);
+    return 1 if ($result eq 'done');
+    return 0;
+}
 
+# -------------------------------------------------- Non-critical communication
+my $max_connection_retries = 10;
 sub subreply {
     my ($cmd,$server)=@_;
     my $peerfile="$perlvar{'lonSockDir'}/".$hostname{$server};
-    my $sclient=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-                                      Type    => SOCK_STREAM,
-                                      Timeout => 10)
-       or return "con_lost";
+    my $sclient;
+    for (my $retries = 0; $retries < $max_connection_retries; $retries++) {
+	$sclient=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+				       Type    => SOCK_STREAM,
+				       Timeout => 10);
+	if($sclient) {
+	    last;		# Connected!
+	} else {
+	    &create_connection($hostname{$server},$server);
+	}
+        sleep(1);		# Try again later if failed connection.
+    }
     print $sclient "sethost:$server:$cmd\n";
     my $answer=<$sclient>;
     chomp($answer);