--- loncom/lonnet/perl/lonnet.pm	2006/10/27 21:54:40	1.800
+++ loncom/lonnet/perl/lonnet.pm	2006/11/20 23:50:51	1.805
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.800 2006/10/27 21:54:40 albertel Exp $
+# $Id: lonnet.pm,v 1.805 2006/11/20 23:50:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3219,12 +3219,15 @@ sub eget {
 
 # ------------------------------------------------------------ tmpput interface
 sub tmpput {
-    my ($storehash,$server)=@_;
+    my ($storehash,$server,$context)=@_;
     my $items='';
     foreach my $item (keys(%$storehash)) {
 	$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
     }
     $items=~s/\&$//;
+    if (defined($context)) {
+        $items .= ':'.&escape($context);
+    }
     return &reply("tmpput:$items",$server);
 }
 
@@ -4296,8 +4299,8 @@ sub auto_instcode_defaults {
                     $returnhash->{&unescape($name)}=&unescape($value);
                 }
             }
+            $ok_response = 1;
         }
-        $ok_response = 1;
     }
     if ($ok_response) {
         return 'ok';
@@ -4321,11 +4324,39 @@ sub get_coursegroups {
     return(&dump('coursegroups',$cdom,$cnum,$group));
 }
 
+sub get_deleted_groups {
+    my ($cdom,$cnum,$group) = @_;
+    return(&dump('deleted_groups',$cdom,$cnum,$group));
+}
+
 sub modify_coursegroup {
     my ($cdom,$cnum,$groupsettings) = @_;
     return(&put('coursegroups',$groupsettings,$cdom,$cnum));
 }
 
+sub delete_coursegroup {
+    my ($cdom,$cnum,$group) = @_;
+    my %curr_group = &get_coursegroups($cdom,$cnum,$group);
+    if (my $tmp = &error(%curr_group)) {
+        &Apache::lonnet::logthis('Error retrieving group: '.$tmp.' in '.$cnum.':'.$cdom);
+        return ('read error',$tmp);
+    } else {
+        my %savedsettings = %curr_group; 
+        my $result = &put('deleted_groups',\%savedsettings,$cdom,$cnum);
+        my $deloutcome;
+        if ($result eq 'ok') {
+            $deloutcome = &del('coursegroups',[$group],$cdom,$cnum);
+        } else {
+            return ('write error',$result);
+        }
+        if ($deloutcome eq 'ok') {
+            return 'ok';
+        } else {
+            return ('delete error',$deloutcome);
+        }
+    }
+}
+
 sub modify_group_roles {
     my ($cdom,$cnum,$group_id,$user,$end,$start,$userprivs) = @_;
     my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id;
@@ -6604,6 +6635,7 @@ sub rndseed {
     if (!$domain) { $domain=$wdomain; }
     if (!$username) { $username=$wusername }
     my $which=&get_rand_alg();
+
     if (defined(&getCODE())) {
 	if ($which eq '64bit5') {
 	    return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
@@ -6661,7 +6693,6 @@ sub rndseed_64bit {
 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
 	#&logthis("rndseed :$num:$symb");
 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
-	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
 	return "$num1,$num2";
     }
 }
@@ -6684,6 +6715,7 @@ sub rndseed_64bit2 {
 	my $num2=$nameseed+$domainseed+$courseseed;
 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
 	#&logthis("rndseed :$num:$symb");
+	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
 	return "$num1,$num2";
     }
 }
@@ -7236,7 +7268,7 @@ BEGIN {
 	while (my $line = <$fh>) {
            next if ($line =~ /^(\#|\s*$)/);
 #           next if /^\#/;
-           chomp;
+           chomp $line;
            my ($domain, $domain_description, $def_auth, $def_auth_arg,
 	       $def_lang, $city, $longi, $lati, $primary) = split(/:/,$line,9);
 	   $domain_auth_def{$domain}=$def_auth;