--- loncom/interface/loncoursegroups.pm 2006/12/04 14:59:56 1.67 +++ loncom/interface/loncoursegroups.pm 2007/05/02 01:33:48 1.70 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursegroups.pm,v 1.67 2006/12/04 14:59:56 raeburn Exp $ +# $Id: loncoursegroups.pm,v 1.70 2007/05/02 01:33:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1216,7 +1216,7 @@ sub reenable_folder { $LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx; my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1); if ($errtext) { - $outcome = &mt('Error storing updated parent folder to group'). + $outcome = &mt('Error saving updated parent folder to group'). "- $allgrpsmap - $errtext".'
'; } else { my ($furl,$ferr) = @@ -1266,7 +1266,7 @@ sub modify_folders { $#LONCAPA::map::order--; my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1); if ($errtext) { - $outcome = &mt('Error storing updated parent folder to group'). "- $map - $errtext".'
'; + $outcome = &mt('Error saving updated parent folder to group'). "- $map - $errtext".'
'; } else { my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum); @@ -3139,7 +3139,7 @@ sub write_group_data { $description,$tools,\%groupinfo, $gpterm,$ucgpterm,$crstype); if ($result ne 'ok') { - $r->print(&mt('A problem occurred when creating folders for the new [_1].
[_2]
',$gpterm,$result)); + $r->print(&mt('A problem occurred when creating folders for the new [_1].
[_2]
',$gpterm,$result)); } $r->print(&mt('[_1] [_2] was created.
',$ucgpterm,$groupname)); } elsif ($action eq 'modify') { @@ -3679,8 +3679,8 @@ sub add_group_folder { if ($action eq 'create') { if (&get_folder_lock($cdom,$cnum,'group_allfolders',$now) eq 'ok') { # check if group_allfolders.sequence exists. - my ($errtext,$fatal)=&LONCAPA::map::mapread($allgrpsmap); - if ($fatal == 2) { #file does not exist; + my $mapcontents = &Apache::lonnet::getfile($allgrpsmap); + if ($mapcontents eq '-1') { #file does not exist; my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm); my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'}; $topmap_url =~ s|/+|/|g; @@ -3767,7 +3767,7 @@ sub get_folder_lock { while (($gotlock ne 'ok') && $tries <3) { $tries ++; - sleep 1; + sleep(1); $gotlock = &Apache::lonnet::newput('coursegroups',$lockhash,$cdom,$cnum); } return $gotlock; @@ -3808,7 +3808,7 @@ sub map_updater { $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx; my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1); if ($errtext) { - $outcome = &mt('Error storing updated parent folder')." ($parentmap): $errtext".'
'; + $outcome = &mt('Error saving updated parent folder')." ($parentmap): $errtext".'
'; return $outcome; } }