--- loncom/interface/loncoursedata.pm	2003/04/21 15:12:37	1.70
+++ loncom/interface/loncoursedata.pm	2003/06/02 17:09:09	1.74
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.70 2003/04/21 15:12:37 matthew Exp $
+# $Id: loncoursedata.pm,v 1.74 2003/06/02 17:09:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,6 +209,39 @@ sub LoadDiscussion {
     return \%Discuss;
 }
 
+################################################
+################################################
+
+=pod
+
+=item &GetUserName(username,userdomain)
+
+Returns a hash with the following entries:
+   'firstname', 'middlename', 'lastname', 'generation', and 'fullname'
+
+   'fullname' is the result of &Apache::loncoursedata::ProcessFullName.
+
+=cut
+
+################################################
+################################################
+sub GetUserName {
+    my ($username,$userdomain) = @_;
+    $username = $ENV{'user.name'} if (! defined($username));
+    $userdomain = $ENV{'user.domain'} if (! defined($username));
+    my %userenv = &Apache::lonnet::get('environment',
+                           ['firstname','middlename','lastname','generation'],
+                                       $userdomain,$username);
+    $userenv{'fullname'} = &ProcessFullName($userenv{'lastname'},
+                                            $userenv{'generation'},
+                                            $userenv{'firstname'},
+                                            $userenv{'middlename'});
+    return %userenv;
+}
+
+################################################
+################################################
+
 =pod
 
 =item &ProcessFullName()
@@ -219,6 +252,8 @@ is Lastname generation, firstname middle
 
 =cut
 
+################################################
+################################################
 sub ProcessFullName {
     my ($lastname, $generation, $firstname, $middlename)=@_;
     my $Str = '';
@@ -420,6 +455,13 @@ sub init_dbs {
     my $courseid = shift;
     &setup_table_names($courseid);
     #
+    # Drop any of the existing tables
+    foreach my $table ($symb_table,$part_table,$student_table,
+                       $updatetime_table,$performance_table,
+                       $parameters_table) {
+        &Apache::lonmysql::drop_table($table);
+    }
+    #
     # Note - changes to this table must be reflected in the code that 
     # stores the data (calls &Apache::lonmysql::store_row with this table
     # id
@@ -492,6 +534,9 @@ sub init_dbs {
                     { name => 'part_id',
                       type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },
+                    { name => 'part',
+                      type => 'VARCHAR(100)',
+                      restrictions => 'NOT NULL'},                    
                     { name => 'solved',
                       type => 'TINYTEXT' },
                     { name => 'tries',
@@ -910,12 +955,12 @@ sub update_student_data {
             my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};
             my $timestamp = $param_hash->{'timestamp'};
             #
-            $solved      = '' if (! defined($awarded));
+            $solved      = '' if (! defined($solved));
             $tries       = '' if (! defined($tries));
             $awarded     = '' if (! defined($awarded));
             $award       = '' if (! defined($award));
             $awarddetail = '' if (! defined($awarddetail));
-            $newstring = "('".join("','",$symb_id,$student_id,$part_id,
+            $newstring = "('".join("','",$symb_id,$student_id,$part_id,$part,
                                    $solved,$tries,$awarded,$award,
                                    $awarddetail,$timestamp)."'),\n";
             $store_performance_command .= $newstring;
@@ -1059,12 +1104,12 @@ sub get_student_data_from_performance_ca
     #
     my $dbh = &Apache::lonmysql::get_dbh();
     my $request = "SELECT ".
-        "d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".
+        "d.symb,a.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".
             "a.timestamp ";
     if (defined($student)) {
         $request .= "FROM $student_table AS b ".
             "LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".
-            "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".
+#            "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".
             "LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ".
                 "WHERE student='$student'";
         if (defined($symb) && $symb ne '') {
@@ -1073,7 +1118,7 @@ sub get_student_data_from_performance_ca
     } elsif (defined($symb) && $symb ne '') {
         $request .= "FROM $symb_table as d ".
             "LEFT JOIN $performance_table AS a ON d.symb_id=a.symb_id ".
-            "LEFT JOIN $part_table    AS c ON c.part_id = a.part_id ".
+#            "LEFT JOIN $part_table    AS c ON c.part_id = a.part_id ".
             "LEFT JOIN $student_table AS b ON b.student_id = a.student_id ".
                 "WHERE symb='".$dbh->quote($symb)."'";
     }
@@ -1151,6 +1196,17 @@ sub get_current_state {
     return () if (! defined($sname) || ! defined($sdom));
     #
     my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);
+    &Apache::lonnet::logthis
+        ('sname = '.$sname.
+         ' domain = '.$sdom.
+         ' status = '.$status.
+         ' data is '.(defined($data)?'defined':'undefined'));
+#    while (my ($symb,$hash) = each(%$data)) {
+#        &Apache::lonnet::logthis($symb."\n----------------------------------");
+#        while (my ($key,$value) = each (%$hash)) {
+#            &Apache::lonnet::logthis("   ".$key." = ".$value);
+#        }
+#    }
     #
     if (defined($data)) {
         if (defined($symb)) {