--- loncom/automation/batchcreatecourse.pm	2009/08/15 00:25:34	1.30
+++ loncom/automation/batchcreatecourse.pm	2010/01/30 15:47:01	1.34
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.30 2009/08/15 00:25:34 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.34 2010/01/30 15:47:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,7 +159,7 @@ use strict;
 # firstres can be nav, syl, or blank for "Navigate Contents", Syllabus, or
 # no entry respectively.
 # 
-# crstype can be Course or Group
+# crstype can be Course or Community
 #
 # crsquota is the total disk space permitted for course group portfolio files
 # in all course groups.
@@ -197,9 +197,10 @@ sub create_courses {
     open(FILE,"<$$perlvarref{'lonTabDir'}.'/rolesplain.tab");
     my @rolesplain = <FILE>;
     close(FILE);
-    foreach (@rolesplain) {
-        if ($_ =~ /^(st|ta|ex|ad|in|cc):([\w\s]+)$/) {
-            $longroles{$1} = $2;
+    foreach my $item (@rolesplain) {
+        if ($item =~ /^(st|ta|ep|ad|in|cc|co):([\w\s]+):?([\w\s]*)/) {
+            $longroles{'Course'}{$1} = $2;
+            $longroles{'Community'}{$1} = $3;
         }
     }
     my ($logmsg,$keysmsg,$newusermsg,$addresult);
@@ -253,6 +254,7 @@ sub parse_coursereqs {
     my $userkey = '';
     my $role = '';
     my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','datemode','dateshift','showphotos','setpolicy','setcontent','setkeys','keyauth','disresdis','disablechat','openall','notify_owner','notify_dc','crstype','crsquota');
+    my @possroles = qw(st ad ep ta in cc co);
     my @dateitems = ('enrollstart','enrollend','accessstart','accessend');
     my @useritems = ('autharg','authtype','firstname','generation','lastname','middlename','studentID');
     my $p = HTML::Parser->new
@@ -272,7 +274,7 @@ sub parse_coursereqs {
                  }
                  if ("@state" eq "class users user roles role") {
                      $role = $attr->{id};
-                     if ($role =~ /^(st|ad|ep|ta|in|cc)$/) {
+                     if (grep(/^\Q$role\E$/,@possroles)) {
                          push(@{$$details{$num}{'users'}{$userkey}{'roles'}}, $role);  
                          %{$$details{$num}{'users'}{$userkey}{$role}} = ();
                          @{$$details{$num}{'users'}{$userkey}{$role}{'usec'}} = ();
@@ -318,17 +320,17 @@ sub parse_coursereqs {
                     @{$$details{$num}{'users'}{$userkey}{'roles'}} = ();
                  } elsif ("@state" eq "class users user email") {
                     $$details{$num}{'users'}{$userkey}{'emailaddr'} = $text;
-                    $$details{$num}{'users'}{$userkey}{'emailenc'} = &Apache::lonnet::escape($text); 
+                    $$details{$num}{'users'}{$userkey}{'emailenc'} = &LONCAPA:escape($text); 
                  } elsif ("@state" eq "class users user roles role start") {
-                     if ($role =~ /^(st|ad|ep|ta|in|cc)$/) {
+                     if (grep(/^\Q$role\E$/,@possroles)) {
                          $$details{$num}{'users'}{$userkey}{$role}{'start'} = &process_date($text);
                      }
                  } elsif ("@state" eq "class users user roles role end") {
-                     if ($role =~ /^(st|ad|ep|ta|in|cc)$/) {
+                     if (grep(/^\Q$role\E$/,@possroles)) {
                          $$details{$num}{'users'}{$userkey}{$role}{'end'} = &process_date($text);
                      }
                  } elsif ("@state" eq "class users user roles role usec") {
-                     if ($role =~ /^(st|ad|ep|ta|in|cc)$/) {
+                     if (grep(/^\Q$role\E$/,@possroles)) {
                          unless ($text eq '') {
                              push(@{$$details{$num}{'users'}{$userkey}{$role}{'usec'}},$text);
                          }
@@ -403,7 +405,20 @@ sub build_course {
     my $xliststr = '';
     my $noenddate = '';
     my $outcome;
-    my ($courseid,$crsudom,$crsunum);
+    my ($courseid,$crsudom,$crsunum,$crstype,$ccrole,$rolenames);
+    if ($details->{'crstype'} eq 'Community') {
+        $crstype = $details->{'crstype'};
+        $ccrole ='co';
+        if (ref($longroles) eq 'HASH') {
+            $rolenames = $longroles->{'Community'};
+        }
+    } else {
+        $crstype = 'Course';
+        $ccrole = 'cc';
+        if (ref($longroles) eq 'HASH') {
+            $rolenames = $longroles->{'Course'};
+        }
+    }
     my $linefeed;
     if ($context eq 'auto') {
         $linefeed = "\n";
@@ -453,9 +468,9 @@ sub build_course {
                     'cid' => '',
                     'context' => 'createowner',
                     'linefeed' => $linefeed,
-                    'role' => 'cc',
+                    'role' => $ccrole,
                    };
-        $outcome = &LONCAPA::Enrollment::create_newuser($ownerargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,\%courseinfo,$context);
+        $outcome = &LONCAPA::Enrollment::create_newuser($ownerargs,$logmsg,$newusermsg,$enrollcount,$addresult,$rolenames,\%courseinfo,$context);
     } else {
         $outcome = 'ok';
     }
@@ -521,15 +536,21 @@ sub build_course {
     }
     
 #
-# Make owner a course coordinator
+# Make owner a coordinator
 #
     if (($owner_domain) && ($owner_uname)) {
-        &Apache::lonnet::assignrole($owner_domain,$owner_uname,$courseid,'cc','','','','',$context);
+        &Apache::lonnet::assignrole($owner_domain,$owner_uname,$courseid,$ccrole,'','','','',$context);
     }
 
 #
 # Process other reqested users
 #
+
+    my @courseroles = qw(st ep ta in);
+    push(@courseroles,$ccrole);
+    if (&owner_is_dc($owner_uname,$owner_domain,$crsudom)) {
+        push(@courseroles,'ad');
+    }
     my $stulogmsg = '';
     foreach my $userkey (sort(keys(%{$details->{'users'}}))) {
         my $url = '/'.$crsudom.'/'.$crsunum;
@@ -537,8 +558,35 @@ sub build_course {
         if (@{$details->{'users'}{$userkey}{'roles'}} > 0) {
             my ($username,$userdom) = split/:/,$userkey;
             if (&Apache::lonnet::homeserver($username,$userdom) eq 'no_host') { # Add user if no account
-                my $firstrole = $details->{'users'}{$userkey}{'roles'}[0];
-                my $firstsec = $details->{'users'}{$userkey}{$firstrole}{'usec'}[0];
+                my @reqroles = @{$details->{'users'}{$userkey}{'roles'}};
+                my @badroles;
+                my $firstrole = shift(@reqroles);
+                while (@reqroles > 0) { 
+                    if ($firstrole =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                        if (($1 eq $owner_domain) && ($2 eq $owner_uname)) {
+                            last;
+                        } else {
+                            push(@badroles,$firstrole);
+                            $firstrole = shift(@reqroles);
+                        }
+                    } elsif (grep(/^\Q$firstrole\E$/,@courseroles)) {
+                        last;
+                    } else {
+                        push(@badroles,$firstrole);
+                        $firstrole = shift(@reqroles);
+                    }
+                }
+                if (@badroles > 0) {
+                    if (@badroles > 1) {
+                        $$output .= &mt('The following requested roles are unavailable:').' '.join(', ',@badroles);
+                    } else {
+                        $$output .= &mt('The following requested role: [_1] is unavailable.',$badroles[0]); 
+                    }
+                }
+                my $firstsec;
+                unless (($firstrole eq $ccrole) || ($firstrole eq ''))  {
+                    $firstsec = $details->{'users'}{$userkey}{$firstrole}{'usec'}[0];
+                }
                 my $userargs = {
                     'auth' => $details->{'users'}{$userkey}{'authtype'},
                     'authparam' => $details->{'users'}{$userkey}{'autharg'},
@@ -564,7 +612,7 @@ sub build_course {
                 $outcome = &LONCAPA::Enrollment::create_newuser($userargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,\%courseinfo,$context);
 # now add other roles and other sections.
                 if ($outcome eq 'ok') {
-                    if (($firstrole ne 'st') && (@{$details->{'users'}{$userkey}{$firstrole}{'usec'}} > 1)) {
+                    if ((($firstrole ne 'st') && ($firstrole ne $ccrole) && ($firstrole ne '')) && (@{$details->{'users'}{$userkey}{$firstrole}{'usec'}} > 1)) {
                         for (my $i=1; $i<@{$details->{'users'}{$userkey}{$firstrole}{'usec'}}; $i++) {
                             my $curr_role = $firstrole;
                             my $start = $details->{'users'}{$userkey}{$curr_role}{'start'};
@@ -574,12 +622,15 @@ sub build_course {
                             if ($usec ne '') {
                                 $url .= '/'.$usec;
                             }
-                            $$output .= &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                            if ($firstrole =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                                $$output .= &Apache::loncommon::commit_customrole($userdom,$username,$url,$1,$2,$3,$start,$end,$context);
+                            } else {
+                                $$output .= &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                            }
                         }
                     }
-                    if (@{$details->{'users'}{$userkey}{'roles'}} > 1) {
-                        for (my $j=1; $j<@{$details->{'users'}{$userkey}{'roles'}}; $j++) {
-                            my $curr_role = $details->{'users'}{$userkey}{'roles'}[$j];
+                    if (@reqroles > 0) {
+                        foreach my $curr_role (@reqroles) {
                             my $start = $details->{'users'}{$userkey}{$curr_role}{'start'};
                             my $end = $details->{'users'}{$userkey}{$curr_role}{'end'};
                             if ($curr_role eq 'st') {
@@ -589,14 +640,32 @@ sub build_course {
                                     $url .= '/'.$usec;
                                 }
                                 $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
-                            } else {
+                            } elsif ($curr_role eq $ccrole) {
+                                $url = '/'.$crsudom.'/'.$crsunum;
+                                my $usec = '';
+                                $$output .=
+                                    &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                            } elsif ((grep(/^\Q$curr_role\E$/,@courseroles)) || 
+                                     ($curr_role =~ m{^cr/$match_domain/$match_username/[^/]+$})) {
                                 foreach my $usec (@{$details->{'users'}{$userkey}{$curr_role}{'usec'}}) {
                                     $url = '/'.$crsudom.'/'.$crsunum;
                                     if ($usec ne '') {
                                         $url .= '/'.$usec;
                                     }
-                                    $$output .= &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                                    if ($curr_role =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                                        if (($1 eq $owner_domain) && ($2 eq $owner_uname)) {
+                                            $$output .= 
+                                                &Apache::loncommon::commit_customrole($userdom,$username,$url,$1,$2,$3,$start,$end,$context);
+                                        } else {
+                                            $$output = &mt('Requested custom role: [_1] unavailable, as it was not defined by the course owner.',$curr_role);
+                                        }
+                                    } else {
+                                        $$output .= 
+                                            &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                                    }
                                 }
+                            } else {
+                                $$output .= &mt('Requested role: [_1] is unavailable.',$curr_role);
                             }
                         }
                     }
@@ -612,20 +681,44 @@ sub build_course {
                             $url .= '/'.$usec;
                         }
                         $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
-                    } else {
+                    } elsif ((grep(/^\Q$curr_role\E$/,@courseroles)) ||
+                                     ($curr_role =~ m{^cr/$match_domain/$match_username/[^/]+$})) {
                         if (@{$details->{'users'}{$userkey}{$curr_role}{'usec'}} > 0) {
                             foreach my $usec (@{$details->{'users'}{$userkey}{$curr_role}{'usec'}}) {
                                 $url = '/'.$crsudom.'/'.$crsunum;
                                 if ($usec ne '') {
                                     $url .= '/'.$usec;
                                 }
-                                my $stdresult = &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                                my $stdresult;
+                                if ($curr_role =~ m{/^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                                    if (($1 eq $owner_domain) && ($2 eq $owner_uname)) {
+                                        $stdresult = 
+                                            &Apache::loncommon::commit_customrole($userdom,$username,$url,$1,$2,$3,$start,$end,$context);
+                                    } else {
+                                        $stdresult = &mt('Requested custom role: [_1] unavailable, as it was not defined by the course owner.',$curr_role);
+                                    }
+                                } else {
+                                    $stdresult = 
+                                        &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                                }
                                 $$output .= $stdresult;
                             }
                         } else {
                             $url = '/'.$crsudom.'/'.$crsunum;
-                            $$output .= &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,'',$context);
+                            if ($curr_role =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                                if (($1 eq $owner_domain) && ($2 eq $owner_uname)) {
+                                    $$output .= 
+                                        &Apache::loncommon::commit_customrole($userdom,$username,$url,$1,$2,$3,$start,$end,$context);
+                                } else {
+                                    $$output .= &mt('Requested custom role: [_1] unavailable, as it was not defined by the course owner.',$curr_role);
+                                }
+                            } else {
+                                $$output .= 
+                                    &Apache::loncommon::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,'',$context);
+                            }
                         }
+                    } else {
+                        $$output .= &mt('Requested role: [_1] is unavailable.',$curr_role);
                     }
                 }
             }
@@ -642,6 +735,17 @@ sub build_course {
     return $courseid;
 }
 
+sub owner_is_dc {
+    my ($owner_uname,$owner_dom,$cdom) = @_;
+    my $is_dc = 0;
+    my %roles = &Apache::lonnet::get_my_roles($owner_uname,$owner_dom,'userroles',
+                    ['active'],['dc'],[$cdom]);
+    if ($roles{$owner_uname.':'.$owner_dom.':dc'}) {
+        $is_dc = 1;
+    }
+    return $is_dc;
+}
+
 #########################################################
 #
 # process_date()