--- loncom/lond	2006/02/09 20:39:25	1.318.2.2
+++ loncom/lond	2006/02/10 09:47:36	1.320
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.318.2.2 2006/02/09 20:39:25 albertel Exp $
+# $Id: lond,v 1.320 2006/02/10 09:47:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@ my $status='';
 my $lastlog='';
 my $lond_max_wait_time = 13;
 
-my $VERSION='$Revision: 1.318.2.2 $'; #' stupid emacs
+my $VERSION='$Revision: 1.320 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3068,10 +3068,11 @@ sub store_handler {
 	    my $version=$hashref->{"version:$rid"};
 	    my $allkeys=''; 
 	    foreach my $pair (@pairs) {
-		my ($key)=split(/=/,$pair);
+		my ($key,$value)=split(/=/,$pair);
 		$allkeys.=$key.':';
+		$hashref->{"$version:$rid:$key"}=$value;
 	    }
-	    $hashref->{"$version:$rid"}=$what."\&timestamp=$now";
+	    $hashref->{"$version:$rid:timestamp"}=$now;
 	    $allkeys.='timestamp';
 	    $hashref->{"$version:keys:$rid"}=$allkeys;
 	    if (&untie_user_hash($hashref)) {
@@ -3137,17 +3138,9 @@ sub restore_handler {
 	    my @keys=split(/:/,$vkeys);
 	    my $key;
 	    $qresult.="$scope:keys=$vkeys&";
-	    if (exists($hashref->{"$scope:$rid"})) {
-		my $what=$hashref->{"$scope:$rid"};
-		foreach my $pair (split(/\&/,$hashref->{"$scope:$rid"})) {
-		    my ($key,$value)=split(/=/,$pair);
-		    $qresult.="$scope:".$pair."&";
-		}
-	    } else {
-		foreach $key (@keys) {
-		    $qresult.="$scope:$key=".$hashref->{"$scope:$rid:$key"}."&";
-		}
-	    }
+	    foreach $key (@keys) {
+		$qresult.="$scope:$key=".$hashref->{"$scope:$rid:$key"}."&";
+	    }                                  
 	}
 	if (&untie_user_hash($hashref)) {
 	    $qresult=~s/\&$//;
@@ -4355,10 +4348,19 @@ sub photo_permission_handler {
     my $userinput               = "$cmd:$tail";
     my $cdom = $tail;
     my ($perm_reqd,$conditions);
-    my $outcome = &localenroll::photo_permission($cdom,\$perm_reqd,
-						 \$conditions);
-    &Reply($client, &escape($outcome.':'.$perm_reqd.':'. $conditions)."\n",
-	   $userinput);
+    my $outcome;
+    eval {
+	local($SIG{__DIE__})='DEFAULT';
+	$outcome = &localenroll::photo_permission($cdom,\$perm_reqd,
+						  \$conditions);
+    };
+    if (!$@) {
+	&Reply($client, &escape($outcome.':'.$perm_reqd.':'. $conditions)."\n",
+	       $userinput);
+    } else {
+	&Failure($client,"unknown_cmd\n",$userinput);
+    }
+    return 1;
 }
 &register_handler("autophotopermission",\&photo_permission_handler,0,1,0);
 
@@ -4383,6 +4385,7 @@ sub photo_check_handler {
     my $result = &localstudentphoto::fetch($udom,$uname,$pid,\$response);
     $result .= ':'.$response;
     &Reply($client, &escape($result)."\n",$userinput);
+    return 1;
 }
 &register_handler("autophotocheck",\&photo_check_handler,0,1,0);
 
@@ -4396,8 +4399,17 @@ sub photo_choice_handler {
     my ($cmd, $tail, $client) = @_;
     my $userinput             = "$cmd:$tail";
     my $cdom                  = &unescape($tail);
-    my ($update,$comment) = &localenroll::manager_photo_update($cdom);
-    &Reply($client,&escape($update).':'.&escape($comment)."\n",$userinput);
+    my ($update,$comment);
+    eval {
+	local($SIG{__DIE__})='DEFAULT';
+	($update,$comment)    = &localenroll::manager_photo_update($cdom);
+    };
+    if (!$@) {
+	&Reply($client,&escape($update).':'.&escape($comment)."\n",$userinput);
+    } else {
+	&Failure($client,"unknown_cmd\n",$userinput);
+    }
+    return 1;
 }
 &register_handler("autophotochoice",\&photo_choice_handler,0,1,0);
 
@@ -4430,7 +4442,10 @@ sub student_photo_handler {
     &mkpath($path);
     my $file;
     if ($type eq 'thumbnail') {
-        $file=&localstudentphoto::fetch_thumbnail($domain,$uname);
+	eval {
+	    local($SIG{__DIE__})='DEFAULT';
+	    $file=&localstudentphoto::fetch_thumbnail($domain,$uname);
+	};
     } else {
         $file=&localstudentphoto::fetch($domain,$uname);
     }
@@ -5153,7 +5168,7 @@ sub sub_sql_reply {
                                       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"; }