--- loncom/lond 2006/02/09 20:23:28 1.318.2.1 +++ loncom/lond 2006/02/09 23:41:22 1.318.2.4 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.318.2.1 2006/02/09 20:23:28 albertel Exp $ +# $Id: lond,v 1.318.2.4 2006/02/09 23:41:22 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.1 $'; #' stupid emacs +my $VERSION='$Revision: 1.318.2.4 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -2915,11 +2915,17 @@ sub dump_profile_database { while (my ($key,$value) = each(%$hashref)) { my ($v,$symb,$param) = split(/:/,$key); next if ($v eq 'version' || $symb eq 'keys'); - next if (exists($data{$symb}) && - exists($data{$symb}->{$param}) && - $data{$symb}->{'v.'.$param} > $v); - $data{$symb}->{$param}=$value; - $data{$symb}->{'v.'.$param}=$v; + # making old style store entries '$ver:$symb:$key = $value' + # look like new '$ver:$symb = "$key=$value"' + if (defined($param)) { $value = $param.'='.$value; } + foreach my $pair (split(/\&/,$value)) { + my ($param,$value)=split(/=/,$pair); + next if (exists($data{$symb}) && + exists($data{$symb}->{$param}) && + $data{$symb}->{'v.'.$param} > $v); + $data{$symb}->{$param}=$value; + $data{$symb}->{'v.'.$param}=$v; + } } if (&untie_user_hash($hashref)) { while (my ($symb,$param_hash) = each(%data)) { @@ -3071,9 +3077,7 @@ sub store_handler { my ($key)=split(/=/,$pair); $allkeys.=$key.':'; } - $hashref->{"$version:$rid"}=$what; - - $hashref->{"$version:$rid:timestamp"}=$now; + $hashref->{"$version:$rid"}=$what."\×tamp=$now"; $allkeys.='timestamp'; $hashref->{"$version:keys:$rid"}=$allkeys; if (&untie_user_hash($hashref)) {