--- loncom/interface/loncoursedata.pm	2003/04/01 16:53:50	1.66
+++ loncom/interface/loncoursedata.pm	2003/05/19 15:44:15	1.71
@@ -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.71 2003/05/19 15:44:15 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,8 +137,6 @@ sub get_sequence_assessment_data {
     # We need to keep track of which sequences contain homework problems
     # 
     my $previous;
-    $curRes = $iterator->next(); # BEGIN_MAP
-    $curRes = $iterator->next(); # The first item in the top level map.
     while (scalar(@Nested_Sequences)) {
         $previous = $curRes;
         $curRes = $iterator->next();
@@ -211,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()
@@ -221,6 +252,8 @@ is Lastname generation, firstname middle
 
 =cut
 
+################################################
+################################################
 sub ProcessFullName {
     my ($lastname, $generation, $firstname, $middlename)=@_;
     my $Str = '';
@@ -581,6 +614,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 +925,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;
@@ -1039,7 +1103,7 @@ sub get_student_data_from_performance_ca
             "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 ".
@@ -1070,6 +1134,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;
 }
 
@@ -1121,7 +1188,11 @@ sub get_current_state {
     my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);
     #
     if (defined($data)) {
-        return %$data;
+        if (defined($symb)) {
+            return %{$data->{$symb}};
+        } else {
+            return %$data;
+        }
     } elsif ($status eq 'no data') {
         return ();
     } else {