--- loncom/interface/loncoursedata.pm	2004/04/06 19:02:00	1.131
+++ loncom/interface/loncoursedata.pm	2005/02/28 20:00:23	1.142
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.131 2004/04/06 19:02:00 matthew Exp $
+# $Id: loncoursedata.pm,v 1.142 2005/02/28 20:00:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,14 +155,9 @@ sub get_sequence_assessment_data {
                 next;
             }
             # get the map itself, instead of BEGIN_MAP
-            $title = $previous->title();
-            $title =~ s/\:/\&\#058;/g;
+            $title = $previous->compTitle;
             $symb  = $previous->symb();
             $src   = $previous->src();
-            # pick up the filename if there is no title available
-            if (! defined($title) || $title eq '') {
-                ($title) = ($src=~/\/([^\/]*)$/);
-            }
             $randompick = $previous->randompick();
             my $newmap = { title    => $title,
                            src      => $src,
@@ -184,14 +179,9 @@ sub get_sequence_assessment_data {
         next if (! ref($curRes));
         next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/);
         # Okay, from here on out we only deal with assessments
-        $title = $curRes->title();
-        $title =~ s/\:/\&\#058;/g;
+        $title = $curRes->compTitle();
         $symb  = $curRes->symb();
         $src   = $curRes->src();
-        # Grab the filename if there is not title available
-        if (! defined($title) || $title eq '') {
-            ($title) = ($src=~ m:/([^/]*)$:);
-        }
         my $parts = $curRes->parts();
         my %partdata;
         foreach my $part (@$parts) {
@@ -199,6 +189,7 @@ sub get_sequence_assessment_data {
             my @Ids       = $curRes->responseIds($part);
             $partdata{$part}->{'ResponseTypes'}= \@Responses;
             $partdata{$part}->{'ResponseIds'}  = \@Ids;
+            $partdata{$part}->{'Survey'}       = $curRes->is_survey($part);
             # Count how many responses of each type there are in this part
             foreach (@Responses) {
                 $partdata{$part}->{$_}++;
@@ -217,7 +208,6 @@ sub get_sequence_assessment_data {
         $currentmap->{'num_assess'}++;
         $currentmap->{'num_assess_parts'}+= scalar(@$parts);
     }
-    $navmap->untieHashes();
     return ($top,\@Sequences,\@Assessments);
 }
 
@@ -250,76 +240,6 @@ sub LoadDiscussion {
 
 =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()
-
-Takes lastname, generation, firstname, and middlename (or some partial
-set of this data) and returns the full name version as a string.  Format
-is Lastname generation, firstname middlename or a subset of this.
-
-=cut
-
-################################################
-################################################
-sub ProcessFullName {
-    my ($lastname, $generation, $firstname, $middlename)=@_;
-    my $Str = '';
-
-    # Strip whitespace preceeding & following name components.
-    $lastname   =~ s/(\s+$|^\s+)//g;
-    $generation =~ s/(\s+$|^\s+)//g;
-    $firstname  =~ s/(\s+$|^\s+)//g;
-    $middlename =~ s/(\s+$|^\s+)//g;
-
-    if($lastname ne '') {
-	$Str .= $lastname;
-	$Str .= ' '.$generation if ($generation ne '');
-	$Str .= ',';
-        $Str .= ' '.$firstname  if ($firstname ne '');
-        $Str .= ' '.$middlename if ($middlename ne '');
-    } else {
-        $Str .= $firstname      if ($firstname ne '');
-        $Str .= ' '.$middlename if ($middlename ne '');
-        $Str .= ' '.$generation if ($generation ne '');
-    }
-
-    return $Str;
-}
-
-################################################
-################################################
-
-=pod
-
 =item &make_into_hash($values);
 
 Returns a reference to a hash as described by $values.  $values is
@@ -547,12 +467,14 @@ store student data.
 ################################################
 ################################################
 sub init_dbs {
-    my $courseid = shift;
+    my ($courseid,$drop) = @_;
     &setup_table_names($courseid);
     #
     # Drop any of the existing tables
-    foreach my $table (@Tables) {
-        &Apache::lonmysql::drop_table($table);
+    if ($drop) {
+        foreach my $table (@Tables) {
+            &Apache::lonmysql::drop_table($table);
+        }
     }
     #
     # Note - changes to this table must be reflected in the code that 
@@ -580,7 +502,7 @@ sub init_dbs {
                       restrictions => 'NOT NULL',
                       auto_inc     => 'yes', },
                     { name => 'part',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},
                     ],
         'PRIMARY KEY' => ['part (100)'],
@@ -595,16 +517,16 @@ sub init_dbs {
                       restrictions => 'NOT NULL',
                       auto_inc     => 'yes', },
                     { name => 'student',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL UNIQUE'},
                     { name => 'section',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},
                     { name => 'status',
-                      type => 'VARCHAR(15)',
+                      type => 'VARCHAR(15) BINARY',
                       restrictions => 'NOT NULL'},
                     { name => 'classification',
-                      type => 'varchar(100)', },
+                      type => 'VARCHAR(100) BINARY', },
                     { name => 'updatetime',
                       type => 'INT UNSIGNED'},
                     { name => 'fullupdatetime',
@@ -629,7 +551,7 @@ sub init_dbs {
                       type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },
                     { name => 'part',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},                    
                     { name => 'solved',
                       type => 'TINYTEXT' },
@@ -709,7 +631,7 @@ sub init_dbs {
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
 #                    { name => 'message',
-#                      type => 'CHAR' },
+#                      type => 'CHAR BINARY'},
                     { name => 'response_specific',
                       type => 'TINYTEXT' },
                     { name => 'response_specific_value',
@@ -1081,6 +1003,7 @@ sub populate_student_table {
     }
     #
     &setup_table_names($courseid);
+    &init_dbs($courseid,0);
     my $dbh = &Apache::lonmysql::get_dbh();
     my $request = 'INSERT IGNORE INTO '.$student_table.
         "(student,section,status) VALUES ";
@@ -1594,7 +1517,7 @@ sub ensure_tables_are_set_up {
         !$found_performance   || !$found_parameters        ||
         !$found_fulldump_part || !$found_fulldump_response ||
         !$found_fulldump_timestamp || !$found_weight ) {
-        if (&init_dbs($courseid)) {
+        if (&init_dbs($courseid,1)) {
             return 'error';
         }
     }
@@ -2030,12 +1953,14 @@ sub get_problem_statistics {
     }
     my ($solved) = &execute_SQL_request($dbh,$request);
     #
+    $Solved -= $solved;
+    #
     $num    = 0 if (! defined($num));
     $tries  = 0 if (! defined($tries));
     $max    = 0 if (! defined($max));
     $min    = 0 if (! defined($min));
     $STD    = 0 if (! defined($STD));
-    $Solved = 0 if (! defined($Solved));
+    $Solved = 0 if (! defined($Solved) || $Solved < 0);
     $solved = 0 if (! defined($solved));
     #
     # Compute the more complicated statistics
@@ -2297,6 +2222,14 @@ sub get_sum_of_scores {
     if (! defined($courseid)) {
         $courseid = $ENV{'request.course.id'};
     }
+    if (defined($students) && 
+        ((@$students == 0) ||
+         (@$students == 1 && (! defined($students->[0]) || 
+                              $students->[0] eq ''))
+         )
+        ){
+        undef($students);
+    }
     #
     &setup_table_names($courseid);
     my $dbh = &Apache::lonmysql::get_dbh();
@@ -2319,7 +2252,9 @@ sub get_sum_of_scores {
     $sth->execute();
     my $rows = $sth->fetchrow_arrayref();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 1 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed, fetchrow_arrayrefed'.
+                                 $/.$request);
         return (undef,undef);
     }
     return ($rows->[0],$rows->[1]);
@@ -2499,7 +2434,8 @@ sub get_student_data {
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 2 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     my $dataset = $sth->fetchall_arrayref();
@@ -2524,7 +2460,15 @@ sub get_response_data {
     #
     &setup_table_names($courseid);
     my $symb_id = &get_symb_id($symb);
+    if (! defined($symb_id)) {
+        &Apache::lonnet::logthis('Unable to find symb for '.$symb.' in '.$courseid);
+        return undef;
+    }
     my $response_id = &get_part_id($response);
+    if (! defined($response_id)) {
+        &Apache::lonnet::logthis('Unable to find id for '.$response.' in '.$courseid);
+        return undef;
+    }
     #
     my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));
@@ -2560,7 +2504,8 @@ sub get_response_data {
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 3 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     my $dataset = $sth->fetchall_arrayref();
@@ -2616,7 +2561,8 @@ sub get_response_data_by_student {
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 4 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     my $dataset = $sth->fetchall_arrayref();
@@ -2636,39 +2582,54 @@ sub RT_tries      { return 2; }
 sub RT_timestamp  { return 3; }
 
 sub get_response_time_data {
-    my ($students,$symb,$part,$courseid) = @_;
+    my ($sections,$enrollment,$symb,$part,$courseid) = @_;
     return undef if (! defined($symb) || 
                      ! defined($part));
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     #
     &setup_table_names($courseid);
     my $symb_id = &get_symb_id($symb);
+    if (! defined($symb_id)) {
+        &Apache::lonnet::logthis('Unable to find symb for '.$symb.' in '.$courseid);
+        return undef;
+    }
     my $part_id = &get_part_id($part);
+    if (! defined($part_id)) {
+        &Apache::lonnet::logthis('Unable to find id for '.$part.' in '.$courseid);
+        return undef;
+    }
     #
     my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));
+    my ($student_requirements,$enrollment_requirements) = 
+        &limit_by_section_and_status($sections,$enrollment,'d');
     my $request = 'SELECT '.
         'a.student_id, a.awarded, a.tries, b.timestamp '.
         'FROM '.$fulldump_part_table.' AS a '.
-        'NATURAL LEFT JOIN '.$fulldump_timestamp_table.' AS b '.
-#        'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.
-#        'a.transaction = b.transaction '.
+        'LEFT JOIN '.$fulldump_timestamp_table.' AS b '.
+        'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.
+        'a.transaction = b.transaction '.
+        'LEFT JOIN '.$student_table.' as d '.
+        'ON a.student_id=d.student_id '.
         'WHERE '.
         'a.symb_id='.$symb_id.' AND a.part_id='.$part_id;
-    if (defined($students)) {
-        $request .= ' AND ('.
-            join(' OR ', map {'a.student_id='.
-                                  &get_student_id($_->{'username'},
-                                                  $_->{'domain'})
-                              } @$students
-                 ).')';
+    if (defined($student_requirements) || defined($enrollment_requirements)) {
+        $request .= ' AND ';
+        if (defined($student_requirements)) {
+            $request .= $student_requirements.' AND ';
+        }
+        if (defined($enrollment_requirements)) {
+            $request .= $enrollment_requirements.' AND ';
+        }
+        $request =~ s/( AND )$//;
     }
     $request .= ' ORDER BY b.timestamp';
 #    &Apache::lonnet::logthis("request =\n".$request);
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 5 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     my $dataset = $sth->fetchall_arrayref();
@@ -2758,7 +2719,8 @@ sub get_student_scores {
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 6 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     $request = 'SELECT score,COUNT(*) FROM '.$tmptable.' GROUP BY score';
@@ -2766,7 +2728,8 @@ sub get_student_scores {
     $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {
-        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        &Apache::lonnet::logthis('error 7 = '.$dbh->errstr());
+        &Apache::lonnet::logthis('prepared then executed '.$/.$request);
         return undef;
     }
     my $dataset = $sth->fetchall_arrayref();
@@ -2873,7 +2836,7 @@ $ENV{'course.'.$cid.'.domain'}, and $ENV
 
 Returns a reference to a hash which contains:
  keys    '$sname:$sdom'
- values  [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type]
+ values  [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype]
 
 The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used
 as indices into the returned list to future-proof clients against
@@ -2893,6 +2856,7 @@ sub CL_SECTION  { return 5; }
 sub CL_FULLNAME { return 6; }
 sub CL_STATUS   { return 7; }
 sub CL_TYPE     { return 8; }
+sub CL_LOCKEDTYPE   { return 9; }
 
 sub get_classlist {
     my ($cid,$cdom,$cnum) = @_;
@@ -2909,9 +2873,9 @@ sub get_classlist {
         }
         my ($sname,$sdom) = split(/:/,$student);
         my @Values = split(/:/,$info);
-        my ($end,$start,$id,$section,$fullname,$type);
+        my ($end,$start,$id,$section,$fullname,$type,$lockedtype);
         if (@Values > 2) {
-            ($end,$start,$id,$section,$fullname,$type) = @Values;
+            ($end,$start,$id,$section,$fullname,$type,$lockedtype) = @Values;
         } else { # We have to get the data ourselves
             ($end,$start) = @Values;
             $section = &Apache::lonnet::getsection($sdom,$sname,$cid);
@@ -2926,14 +2890,13 @@ sub get_classlist {
                 &Apache::lonnet::logthis('unable to retrieve environment '.
                                          'for '.$sname.':'.$sdom);
             } else {
-                $fullname = &ProcessFullName(@info{qw/lastname generation 
-                                                       firstname middlename/});
+                $fullname = &Apache::lonnet::format_name(@info{qw/firstname middlename lastname generation/},'lastname');
                 $id = $info{'id'};
             }
             # Update the classlist with this students information
             if ($fullname ne 'not available') {
-                my $enrolldata = join(':',$end,$start,$id,$section,$fullname);
-                my $reply=&Apache::lonnet::cput('classlist',
+		my $enrolldata = join(':',$end,$start,$id,$section,$fullname);
+		my $reply=&Apache::lonnet::cput('classlist',
                                                 {$student => $enrolldata},
                                                 $cdom,$cnum);
                 if ($reply !~ /^(ok|delayed)/) {
@@ -2948,11 +2911,11 @@ sub get_classlist {
             $status='Active';
         }
         $classlist{$student} = 
-            [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type];
+            [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype];
     }
     if (wantarray()) {
         return (\%classlist,['domain','username','end','start','id',
-                             'section','fullname','status','type']);
+                             'section','fullname','status','type','lockedtype']);
     } else {
         return \%classlist;
     }