--- loncom/interface/loncoursedata.pm	2004/06/15 14:12:56	1.135
+++ loncom/interface/loncoursedata.pm	2005/04/21 17:35:58	1.141.2.3
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.135 2004/06/15 14:12:56 matthew Exp $
+# $Id: loncoursedata.pm,v 1.141.2.3 2005/04/21 17:35:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -142,10 +142,11 @@ sub get_sequence_assessment_data {
     # 
     my $previous_too;
     my $previous;
-    while (scalar(@Nested_Sequences)) {
+    while (1) {
         $previous_too = $previous;
         $previous = $curRes;
         $curRes = $iterator->next();
+	if (!$curRes) { last; }
         my $currentmap = $Nested_Sequences[-1]; # Last one on the stack
         if ($curRes == $iterator->BEGIN_MAP()) {
             if (! ref($previous)) {
@@ -155,14 +156,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 +180,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) {
@@ -218,7 +209,6 @@ sub get_sequence_assessment_data {
         $currentmap->{'num_assess'}++;
         $currentmap->{'num_assess_parts'}+= scalar(@$parts);
     }
-    $navmap->untieHashes();
     return ($top,\@Sequences,\@Assessments);
 }
 
@@ -251,76 +241,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
@@ -2303,6 +2223,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();
@@ -2325,7 +2253,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]);
@@ -2505,7 +2435,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();
@@ -2530,7 +2461,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));
@@ -2566,7 +2505,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();
@@ -2622,7 +2562,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();
@@ -2674,7 +2615,8 @@ sub get_response_time_data {
     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();
@@ -2764,7 +2706,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';
@@ -2772,7 +2715,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();
@@ -2879,7 +2823,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
@@ -2899,6 +2843,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) = @_;
@@ -2915,9 +2860,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);
@@ -2932,14 +2877,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)/) {
@@ -2954,11 +2898,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;
     }