--- loncom/interface/loncoursedata.pm	2006/05/18 01:08:51	1.171
+++ loncom/interface/loncoursedata.pm	2006/12/21 02:51:53	1.177
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.171 2006/05/18 01:08:51 raeburn Exp $
+# $Id: loncoursedata.pm,v 1.177 2006/12/21 02:51:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,8 @@ use Time::HiRes;
 use Apache::lonmysql;
 use HTML::TokeParser;
 use GDBM_File;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 =pod
 
@@ -75,7 +77,7 @@ and/or itself.
 
 Returns a reference to a hash as described by $values.  $values is
 assumed to be the result of 
-    join(':',map {&Apache::lonnet::escape($_)} %orighash);
+    join(':',map {&escape($_)} %orighash);
 
 This is a helper function for get_current_state.
 
@@ -85,8 +87,7 @@ This is a helper function for get_curren
 ################################################
 sub make_into_hash {
     my $values = shift;
-    my %tmp = map { &Apache::lonnet::unescape($_); }
-                                           split(':',$values);
+    my %tmp = map { &unescape($_); } split(':',$values);
     return \%tmp;
 }
 
@@ -1138,7 +1139,6 @@ sub update_full_student_data {
     &setup_table_names($courseid);
     #
     my $student_id = &get_student_id($sname,$sdom);
-    my @group_ids = &get_students_groupids($student_id);
     my $student = $sname.':'.$sdom;
     #
     my $returnstatus = 'okay';
@@ -1421,25 +1421,23 @@ sub update_student_data {
     &setup_table_names($courseid);
     #
     my $student_id = &get_student_id($sname,$sdom);
-    my @group_ids = &get_students_groupids($student_id);
     my $student = $sname.':'.$sdom;
     #
     my $returnstatus = 'okay';
     #
     # Download students data
     my $time_of_retrieval = time;
-    my @tmp = &Apache::lonnet::currentdump($courseid,$sdom,$sname);
-    if ((scalar(@tmp) > 0) && ($tmp[0] =~ /^error:/)) {
+    my %student_data = &Apache::lonnet::currentdump($courseid,$sdom,$sname);
+    if (&Apache::lonnet::error(%student_data)) {
         &Apache::lonnet::logthis('error getting data for '.
                                  $sname.':'.$sdom.' in course '.$courseid.
-                                 ':'.$tmp[0]);
-        $returnstatus = 'error getting data';
+                                 ':'.(%student_data)[0]);
+        $returnstatus =(%student_data)[0] ;
         return ($returnstatus,undef);
     }
-    if (scalar(@tmp) < 1) {
+    if (scalar(keys(%student_data)) < 1) {
         return ('no data',undef);
     }
-    my %student_data = @tmp;
     my @Results = &store_student_data($sname,$sdom,$courseid,\%student_data);
     #
     # Set the students update time
@@ -1473,7 +1471,6 @@ sub store_student_data {
     my ($sname,$sdom,$courseid,$student_data) = @_;
     #
     my $student_id = &get_student_id($sname,$sdom);
-    my @group_ids = &get_students_groupids($student_id);
     my $student = $sname.':'.$sdom;
     #
     my $returnstatus = 'okay';
@@ -1669,8 +1666,11 @@ sub ensure_current_data {
         ($sdom,$sname,$courseid.'.db',
          $Apache::lonnet::perlvar{'lonUsersDir'});
     #
+    if ($modifiedtime == -1) {
+	return ('no data',undef);
+    }
+
     my $student_id = &get_student_id($sname,$sdom);
-    my @group_ids = &get_students_groupids($student_id);
     my @Result = &Apache::lonmysql::get_rows($student_table,
                                              "student_id ='$student_id'");
     my $data = undef;
@@ -1719,7 +1719,6 @@ sub ensure_current_full_data {
          $Apache::lonnet::perlvar{'lonUsersDir'});
     #
     my $student_id = &get_student_id($sname,$sdom);
-    my @group_ids = &get_students_groupids($student_id);
     my @Result = &Apache::lonmysql::get_rows($student_table,
                                              "student_id ='$student_id'");
     my $updatetime;
@@ -1914,7 +1913,7 @@ sub get_current_state {
     } else {
         if ($status ne 'okay' && $status ne '') {
             &Apache::lonnet::logthis('status = '.$status);
-            return ();
+            return ('error: '.$status,undef);
         }
         my $returnhash = &get_student_data_from_performance_cache($sname,$sdom,
                                                       $symb,$courseid);
@@ -2727,7 +2726,7 @@ sub get_response_data {
     if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
         # Clear the \'s from around the submission
         for (my $i =0;$i<scalar(@$dataset);$i++) {
-            $dataset->[$i]->[3] =~ s/(\'$|^\')//g;
+            $dataset->[$i]->[&RD_submission()] =~ s/(\'$|^\')//g;
         }
         return $dataset;
     }
@@ -2755,7 +2754,6 @@ sub get_response_data_by_student {
     #
     my $student_id = &get_student_id($student->{'username'},
                                      $student->{'domain'});
-    my @group_ids = &get_students_groupids($student_id);
     #
     my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));
@@ -2789,7 +2787,7 @@ sub get_response_data_by_student {
     if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
         # Clear the \'s from around the submission
         for (my $i =0;$i<scalar(@$dataset);$i++) {
-            $dataset->[$i]->[2] =~ s/(\'$|^\')//g;
+            $dataset->[$i]->[&RDs_submission] =~ s/(\'$|^\')//g;
         }
         return $dataset;
     }
@@ -3131,6 +3129,9 @@ sub get_classlist {
         if(((!$end) || $now < $end) && ((!$start) || ($now > $start))) {
             $status='Active';
         }
+        if(($now < $start) && ((!$end) || $now < $end )) {
+            $status='Future';
+        }
         $classlist{$student} = 
             [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype];
     }
@@ -3144,6 +3145,9 @@ sub get_classlist {
 
 sub get_group_memberships {
     my ($classlist,$keylist,$cdom,$cnum) = @_;
+
+    return ({},{}) if (!ref($classlist) || !ref($keylist));
+
     my $cid = $cdom.'_'.$cnum;
     if (!defined($cdom) || !defined($cnum)) {
         $cid =  $env{'request.course.id'};