--- loncom/interface/loncoursedata.pm	2003/04/01 16:53:50	1.66
+++ loncom/interface/loncoursedata.pm	2003/06/17 21:45:36	1.78
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.66 2003/04/01 16:53:50 matthew Exp $
+# $Id: loncoursedata.pm,v 1.78 2003/06/17 21:45:36 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
     ##
@@ -118,8 +122,9 @@ sub get_sequence_assessment_data {
     ## 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 $symb  = $top_level_map->symb();
+    my $src   = $top_level_map->src();
+    my $randompick = $top_level_map->randompick();
     #
     my @Sequences; 
     my @Assessments;
@@ -130,29 +135,39 @@ 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);
     #
     # We need to keep track of which sequences contain homework problems
     # 
+    my $previous_too;
     my $previous;
-    $curRes = $iterator->next(); # BEGIN_MAP
-    $curRes = $iterator->next(); # The first item in the top level map.
     while (scalar(@Nested_Sequences)) {
+        $previous_too = $previous;
         $previous = $curRes;
         $curRes = $iterator->next();
         my $currentmap = $Nested_Sequences[-1]; # Last one on the stack
         if ($curRes == $iterator->BEGIN_MAP()) {
+            if (! ref($previous)) {
+                $previous = $previous_too;
+            }
+            if (! ref($previous)) {
+                next;
+            }
             # get the map itself, instead of BEGIN_MAP
             $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
@@ -211,6 +226,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()
@@ -221,6 +269,8 @@ is Lastname generation, firstname middle
 
 =cut
 
+################################################
+################################################
 sub ProcessFullName {
     my ($lastname, $generation, $firstname, $middlename)=@_;
     my $Str = '';
@@ -422,6 +472,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
@@ -494,6 +551,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',
@@ -581,6 +641,36 @@ sub init_dbs {
 
 =pod
 
+=item &delete_caches()
+
+=cut
+
+################################################
+################################################
+sub delete_caches {
+    my $courseid = shift;
+    $courseid = $ENV{'request.course.id'} if (! defined($courseid));
+    #
+    &setup_table_names($courseid);
+    #
+    my $dbh = &Apache::lonmysql::get_dbh();
+    foreach my $table ($symb_table,$part_table,$student_table,
+                       $updatetime_table,$performance_table,
+                       $parameters_table ){
+        my $command = 'DROP TABLE '.$table.';';
+        $dbh->do($command);
+        if ($dbh->err) {
+            &Apache::lonnet::logthis($command.' resulted in error: '.$dbh->errstr);
+        }
+    }
+    return;
+}
+
+################################################
+################################################
+
+=pod
+
 =item &get_part_id()
 
 Get the MySQL id of a problem part string.
@@ -862,7 +952,8 @@ sub update_student_data {
             if ($parameter !~ /(timestamp|resource\.(.*)\.(solved|tries|awarded|award|awarddetail|previous))/) {
                 $newstring = "('".join("','",
                                        $symb_id,$student_id,
-                                       $parameter,$value)."'),\n";
+                                       $parameter)."',".
+                                           $dbh->quote($value)."),\n";
                 $num_parameters ++;
                 if ($newstring !~ /''/) {
                     $store_parameters_command .= $newstring;
@@ -881,12 +972,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;
@@ -1030,21 +1121,21 @@ 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 '') {
-            $request .= " AND d.symb='".$dbh->quote($symb)."'";
+            $request .= " AND d.symb=".$dbh->quote($symb);
         }
     } 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)."'";
     }
@@ -1070,6 +1161,9 @@ sub get_student_data_from_performance_ca
         $studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail;
         $studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne '');
     }
+    if (defined($symb) && $symb ne '') {
+        $studentdata = $studentdata->{$symb};
+    }
     return $studentdata;
 }
 
@@ -1119,9 +1213,24 @@ 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)) {
-        return %$data;
+        if (defined($symb)) {
+            return %{$data->{$symb}};
+        } else {
+            return %$data;
+        }
     } elsif ($status eq 'no data') {
         return ();
     } else {