--- loncom/automation/batchcreatecourse.pm	2010/01/30 15:47:01	1.34
+++ loncom/automation/batchcreatecourse.pm	2013/03/01 04:49:15	1.38
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.34 2010/01/30 15:47:01 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.38 2013/03/01 04:49:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,7 @@ use strict;
 # <title>Underwater Basket Weaving</title>
 # <crstype>Course</crstype>
 # <coursecode>ss05ubw101</coursecode>
+# <defaultcredits>3</defaultcredits>
 # <coursehome>msul1</coursehome>
 # <coursedomain>msu</coursedomain>
 # <reshome>/res/msu/</reshome>
@@ -122,6 +123,7 @@ use strict;
 #   <lastname>Spartan</lastname>x
 #   <middlename></middlename>
 #   <studentID></studentID>
+#   <credits></credits>
 #   <roles></roles>
 #  </user>
 #  <user>
@@ -205,7 +207,7 @@ sub create_courses {
     }
     my ($logmsg,$keysmsg,$newusermsg,$addresult);
     my %enrollcount = ();
-    my $newcoursedir = $$perlvarref{'lonDaemons'}.'/tmp/addcourse/'.$dom.'/'.$context;
+    my $newcoursedir = LONCAPA::tempdir().'/addcourse/'.$dom.'/'.$context;
     if ($context eq 'auto') {
         $newcoursedir .= '/pending';
     } else {
@@ -253,7 +255,7 @@ sub parse_coursereqs {
     my $xlist = 0;
     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 @items = ('title','optional_id','coursecode','defaultcredits','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');
@@ -320,7 +322,7 @@ 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'} = &LONCAPA:escape($text); 
+                    $$details{$num}{'users'}{$userkey}{'emailenc'} = &LONCAPA::escape($text); 
                  } elsif ("@state" eq "class users user roles role start") {
                      if (grep(/^\Q$role\E$/,@possroles)) {
                          $$details{$num}{'users'}{$userkey}{$role}{'start'} = &process_date($text);
@@ -434,7 +436,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'}.',';
@@ -490,6 +496,7 @@ sub build_course {
                course_home =>  $details->{'coursehome'},
                nonstandard => $details->{'nonstandard'},
                crscode => $details->{'coursecode'},
+               defaultcredits => $details->{'defaultcredits'},
                crsquota => $details->{'crsquota'},
                clonecourse => $details->{'clonecrs'},
                clonedomain => $details->{'clonedom'},
@@ -607,8 +614,14 @@ sub build_course {
                     'cdom' => $crsudom,
                     'context' => 'createcourse',
                     'linefeed' => $linefeed,
-                    'role' => $details->{'users'}{$userkey}{'roles'}[0], 
+                    'role' => $details->{'users'}{$userkey}{'roles'}[0],
                    };
+                if ($userargs->{'role'} eq 'st') {
+                    if (exists($details->{'users'}{$userkey}{'credits'})) {  
+                        $userargs->{'credits'} = $details->{'users'}{$userkey}{'credits'};
+                        $userargs->{'credits'} =~ s/[^\d\.]//g;
+                    }
+                }
                 $outcome = &LONCAPA::Enrollment::create_newuser($userargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,\%courseinfo,$context);
 # now add other roles and other sections.
                 if ($outcome eq 'ok') {
@@ -639,7 +652,12 @@ sub build_course {
                                 if ($usec ne '') {
                                     $url .= '/'.$usec;
                                 }
-                                $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                                my $credits;
+                                if (exists($details->{'users'}{$userkey}{'credits'})) {
+                                    $credits = $details->{'users'}{$userkey}{'credits'};
+                                    $credits =~ s/[^\d\.]//g;
+                                }
+                                $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context,$credits);
                             } elsif ($curr_role eq $ccrole) {
                                 $url = '/'.$crsudom.'/'.$crsunum;
                                 my $usec = '';
@@ -680,7 +698,12 @@ sub build_course {
                         if ($usec ne '') {
                             $url .= '/'.$usec;
                         }
-                        $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context);
+                        my $credits;
+                        if (exists($details->{'users'}{$userkey}{'credits'})) {
+                            $credits = $details->{'users'}{$userkey}{'credits'};
+                            $credits =~ s/[^\d\.]//g;
+                        }
+                        $$output .= &Apache::loncommon::commit_studentrole(\$stulogmsg,$userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec,$context,$credits);
                     } elsif ((grep(/^\Q$curr_role\E$/,@courseroles)) ||
                                      ($curr_role =~ m{^cr/$match_domain/$match_username/[^/]+$})) {
                         if (@{$details->{'users'}{$userkey}{$curr_role}{'usec'}} > 0) {