--- loncom/interface/loncoursedata.pm	2003/05/27 15:48:12	1.72
+++ loncom/interface/loncoursedata.pm	2003/06/02 17:18:33	1.75
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.72 2003/05/27 15:48:12 matthew Exp $
+# $Id: loncoursedata.pm,v 1.75 2003/06/02 17:18:33 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,10 @@ sub get_sequence_assessment_data {
     if (!defined($navmap)) {
         return 'Can not open Coursemap';
     }
+    # We explicity grab the top level map because I am not sure we
+    # are pulling it from the iterator.
+    my $top_level_map = $navmap->getById('0.0');
+    #
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $curRes = $iterator->next(); # Top level sequence
     ##
@@ -117,9 +121,10 @@ sub get_sequence_assessment_data {
     ## We are going to loop until we run out of sequences/pages to explore for
     ## resources.  This means we have to start out with something to look
     ## at.
-    my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-    my $symb  = 'top';
-    my $src   = 'not applicable';
+    my $title = $top_level_map->title();
+    my $symb  = $top_level_map->symb();
+    my $src   = $top_level_map->src();
+    my $randompick = $top_level_map->randompick();
     #
     my @Sequences; 
     my @Assessments;
@@ -130,7 +135,9 @@ sub get_sequence_assessment_data {
                 type     => 'container',
                 num_assess => 0,
                 num_assess_parts => 0,
-                contents   => [], };
+                contents   => [], 
+                randompick => $randompick,
+            };
     push (@Sequences,$top);
     push (@Nested_Sequences, $top);
     #
@@ -146,11 +153,13 @@ sub get_sequence_assessment_data {
             $title = $previous->title();
             $symb  = $previous->symb();
             $src   = $previous->src();
+            $randompick = $previous->randompick();
             my $newmap = { title    => $title,
                            src      => $src,
                            symb     => $symb,
                            type     => 'container',
                            num_assess => 0,
+                           randompick => $randompick,
                            contents   => [],
                        };
             push (@{$currentmap->{'contents'}},$newmap); # this is permanent
@@ -455,6 +464,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
@@ -527,6 +543,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',
@@ -945,12 +964,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;
@@ -1094,12 +1113,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 '') {
@@ -1108,7 +1127,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)."'";
     }
@@ -1191,6 +1210,12 @@ sub get_current_state {
          ' 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)) {