Diff for /loncom/interface/loncoursegroups.pm between versions 1.67 and 1.69

version 1.67, 2006/12/04 14:59:56 version 1.69, 2007/01/03 21:55:37
Line 3139  sub write_group_data { Line 3139  sub write_group_data {
                                            $description,$tools,\%groupinfo,                                             $description,$tools,\%groupinfo,
                                            $gpterm,$ucgpterm,$crstype);                                             $gpterm,$ucgpterm,$crstype);
             if ($result ne 'ok') {              if ($result ne 'ok') {
                 $r->print(&mt('A problem occurred when creating folders for the new [_1].<br/>[_2]<br />',$gpterm,$result));                  $r->print(&mt('A problem occurred when creating folders for the new [_1].<br />[_2]<br />',$gpterm,$result));
             }              }
             $r->print(&mt('[_1] [_2] was created.<br />',$ucgpterm,$groupname));              $r->print(&mt('[_1] [_2] was created.<br />',$ucgpterm,$groupname));
         } elsif ($action eq 'modify') {          } elsif ($action eq 'modify') {
Line 3679  sub add_group_folder { Line 3679  sub add_group_folder {
     if ($action eq 'create') {      if ($action eq 'create') {
         if (&get_folder_lock($cdom,$cnum,'group_allfolders',$now) eq 'ok') {          if (&get_folder_lock($cdom,$cnum,'group_allfolders',$now) eq 'ok') {
             # check if group_allfolders.sequence exists.              # check if group_allfolders.sequence exists.
             my ($errtext,$fatal)=&LONCAPA::map::mapread($allgrpsmap);              my $mapcontents = &Apache::lonnet::getfile($allgrpsmap);
             if ($fatal == 2) { #file does not exist;              if ($mapcontents eq '-1') { #file does not exist;
                 my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm);                  my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm);
                 my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'};                  my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'};
                 $topmap_url =~ s|/+|/|g;                  $topmap_url =~ s|/+|/|g;
Line 3767  sub get_folder_lock { Line 3767  sub get_folder_lock {
   
     while (($gotlock ne 'ok') && $tries <3) {      while (($gotlock ne 'ok') && $tries <3) {
         $tries ++;          $tries ++;
         sleep 1;          sleep(1);
         $gotlock = &Apache::lonnet::newput('coursegroups',$lockhash,$cdom,$cnum);          $gotlock = &Apache::lonnet::newput('coursegroups',$lockhash,$cdom,$cnum);
     }      }
     return $gotlock;      return $gotlock;

Removed from v.1.67  
changed lines
  Added in v.1.69


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>