--- loncom/interface/loncoursedata.pm	2003/06/02 17:09:09	1.74
+++ loncom/interface/loncoursedata.pm	2003/08/07 17:26:44	1.83
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.74 2003/06/02 17:09:09 matthew Exp $
+# $Id: loncoursedata.pm,v 1.83 2003/08/07 17:26:44 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,11 +104,14 @@ sub get_sequence_assessment_data {
     my $fn=$ENV{'request.course.fn'};
     ##
     ## use navmaps
-    my $navmap = Apache::lonnavmaps::navmap->new($fn.".db",
-                                                 $fn."_parms.db",1,0);
+    my $navmap = Apache::lonnavmaps::navmap->new();
     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 +121,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,27 +134,43 @@ 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;
     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();
+            # 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,
                            symb     => $symb,
                            type     => 'container',
                            num_assess => 0,
+                           randompick => $randompick,
                            contents   => [],
                        };
             push (@{$currentmap->{'contents'}},$newmap); # this is permanent
@@ -899,7 +919,7 @@ sub update_student_data {
                                  $sname.':'.$sdom.' in course '.$courseid.
                                  ':'.$tmp[0]);
         $returnstatus = 'error getting data';
-        return $returnstatus;
+        return ($returnstatus,undef);
     }
     if (scalar(@tmp) < 1) {
         return ('no data',undef);
@@ -923,7 +943,7 @@ sub update_student_data {
     my $num_parameters = 0;
     my $store_performance_command = 'INSERT INTO '.$performance_table.
         ' VALUES '."\n";
-    return 'error' if (! defined($dbh));
+    return ('error',undef) if (! defined($dbh));
     while (my ($current_symb,$param_hash) = each(%student_data)) {
         #
         # make sure the symb is set up properly
@@ -977,14 +997,14 @@ sub update_student_data {
         &Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
         &Apache::lonnet::logthis('command = '.$store_parameters_command);
         $returnstatus = 'error: unable to insert parameters into database';
-        return $returnstatus,\%student_data;
+        return ($returnstatus,\%student_data);
     }
     $dbh->do($store_performance_command);
     if ($dbh->err()) {
         &Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
         &Apache::lonnet::logthis('command = '.$store_performance_command);
         $returnstatus = 'error: unable to insert performance into database';
-        return $returnstatus,\%student_data;
+        return ($returnstatus,\%student_data);
     }
     $elapsed += Time::HiRes::time - $start;
     #
@@ -1040,7 +1060,7 @@ sub ensure_current_data {
         !$found_student     || !$found_part   ||
         !$found_performance || !$found_parameters) {
         if (&init_dbs($courseid)) {
-            return 'error';
+            return ('error',undef);
         }
     }
     #
@@ -1196,11 +1216,11 @@ 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'));
+#    &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)) {
@@ -1208,13 +1228,12 @@ sub get_current_state {
 #        }
 #    }
     #
-    if (defined($data)) {
-        if (defined($symb)) {
-            return %{$data->{$symb}};
-        } else {
-            return %$data;
-        }
-    } elsif ($status eq 'no data') {
+    if (defined($data) && defined($symb) && ref($data->{$symb})) {
+        return %{$data->{$symb}};
+    } elsif (defined($data) && ! defined($symb) && ref($data)) {
+        return %$data;
+    } 
+    if ($status eq 'no data') {
         return ();
     } else {
         if ($status ne 'okay' && $status ne '') {
@@ -1355,6 +1374,25 @@ sub get_problem_statistics {
     }
     #
     $dbh->do('DROP TABLE '.$stats_table);  # May return an error
+    #
+    # Store in metadata
+    #
+    if ($num) {
+	my %storestats=();
+
+        my $urlres=(split(/\_\_\_/,$symb))[2];
+
+	$storestats{$courseid.'___'.$urlres.'___timestamp'}=time;       
+	$storestats{$courseid.'___'.$urlres.'___stdno'}=$num;
+	$storestats{$courseid.'___'.$urlres.'___avetries'}=$mean;	   
+	$storestats{$courseid.'___'.$urlres.'___difficulty'}=$DegOfDiff;
+
+	$urlres=~/^(\w+)\/(\w+)/; 
+	&Apache::lonnet::put('nohist_resevaldata',\%storestats,$1,$2); 
+    }
+    #
+    # Return result
+    #
     return { num_students => $num,
              tries        => $tries,
              max_tries    => $mod,
@@ -1364,7 +1402,7 @@ sub get_problem_statistics {
              num_solved   => $Solved,
              num_override => $solved,
              per_wrong    => $wrongpercent,
-             deg_of_diff  => $DegOfDiff }
+             deg_of_diff  => $DegOfDiff };
 }
 
 sub execute_SQL_request {