--- loncom/automation/batchcreatecourse.pm	2009/09/05 20:20:17	1.31
+++ loncom/automation/batchcreatecourse.pm	2010/05/24 06:32:38	1.36
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.31 2009/09/05 20:20:17 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.36 2010/05/24 06:32:38 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";
@@ -419,7 +434,11 @@ sub build_course {
     }
     my $firstres =  $details->{'firstres'};
     if ($firstres eq '') {
-        $firstres = 'syl';
+        if ($crstype eq 'Community') {
+            $firstres = 'nav';
+        } else {
+            $firstres = 'syl';
+        }
     }
     foreach my $secid (sort(keys(%{$details->{'sections'}}))) {
         $sectionstr .= $details->{'sections'}{$secid}{'inst'}.':'.$details->{'sections'}{$secid}{'loncapa'}.',';
@@ -453,9 +472,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,16 +540,18 @@ 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 cc);
+
+    my @courseroles = qw(st ep ta in);
+    push(@courseroles,$ccrole);
     if (&owner_is_dc($owner_uname,$owner_domain,$crsudom)) {
         push(@courseroles,'ad');
     }
@@ -567,7 +588,7 @@ sub build_course {
                     }
                 }
                 my $firstsec;
-                unless (($firstrole eq 'cc') || ($firstrole eq ''))  {
+                unless (($firstrole eq $ccrole) || ($firstrole eq ''))  {
                     $firstsec = $details->{'users'}{$userkey}{$firstrole}{'usec'}[0];
                 }
                 my $userargs = {
@@ -595,7 +616,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') && ($firstrole ne 'cc') && ($firstrole ne '')) && (@{$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'};
@@ -623,7 +644,7 @@ sub build_course {
                                     $url .= '/'.$usec;
                                 }
                                 $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
-                            } elsif ($curr_role eq 'cc') {
+                            } elsif ($curr_role eq $ccrole) {
                                 $url = '/'.$crsudom.'/'.$crsunum;
                                 my $usec = '';
                                 $$output .=