--- loncom/interface/loncreatecourse.pm	2005/04/07 06:56:23	1.78
+++ loncom/interface/loncreatecourse.pm	2005/11/04 21:48:30	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.78 2005/04/07 06:56:23 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.83 2005/11/04 21:48:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,7 +90,6 @@ sub writefile {
     my %crsdata=&Apache::lonnet::coursedescription($courseid);
     return &Apache::lonnet::finishuserfileupload(
 					  $crsdata{'num'},$crsdata{'domain'},
-					  $crsdata{'home'},
 					  'output',$which);
 }
 
@@ -215,11 +214,17 @@ sub copyuserfiles {
 
 sub copydbfiles {
     my ($origcrsid,$newcrsid)=@_;
+
+    my ($origcrs_discussion) = ($origcrsid=~m|^/(.*)|);
+    $origcrs_discussion=~s|/|_|g;
     foreach (&crsdirlist($origcrsid)) {
 	if ($_=~/\.db$/) {
 	    unless 
-             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata)/) {
+             ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|(grading|review)queue)/) {
 		 &copydb($origcrsid,$newcrsid,$_);
+		 my $histfile=$_;
+		 $histfile=~s/\.db$/\.hist/;
+		 &copyfile($origcrsid,$newcrsid,$histfile);
 	     }
 	}
     }
@@ -782,7 +787,7 @@ sub construct_course {
             foreach my $item (@sections) {
                 my ($sec,$gp) = split/:/,$item;
                 my $class = $args->{'crscode'}.$sec;
-                my $addcheck = &Apache::lonnet::auto_new_course($crsunum,$crsudom,$class,$cenv{'internal.courseowner'});
+                my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
                 $cenv{'internal.sectionnums'} .= $item.',';
                 unless ($addcheck eq 'ok') {
                     push @badclasses, $class;