--- loncom/interface/statistics/lonstathelpers.pm	2004/09/30 13:44:07	1.27
+++ loncom/interface/statistics/lonstathelpers.pm	2004/11/03 16:13:08	1.29
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.27 2004/09/30 13:44:07 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.29 2004/11/03 16:13:08 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -584,7 +584,7 @@ sub GetStudentAnswers {
                                                  &mt('last student'));
         $student->{'answer'} = $answer;
     }
-    &Apache::lonstathelpers::write_answer_cache();
+    &Apache::lonstathelpers::write_analysis_cache();
     return if ($c->aborted());
     $r->rflush();
     # close progress window
@@ -633,20 +633,21 @@ sub analyze_problem_as_student {
     my $returnvalue;
     my $url = $resource->{'src'};
     my $symb = $resource->{'symb'};
-    my $answer = &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid);
-    if (defined($answer)) {
-        return($answer);
-    }
-    my $courseid = $ENV{'request.course.id'};
-    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze',
-                                        'grade_domain' => $sdom,
-                                        'grade_username' => $sname,
-                                        'grade_symb' => $symb,
-                                        'grade_courseid' => $courseid));
-    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
-    my %Answer=&Apache::lonnet::str2hash($Answ);
+    my $analysis = &get_from_analysis_cache($sname,$sdom,$symb);
+    if (! defined($analysis)) {
+        &Apache::lonnet::logthis('uncached analysis');
+        my $courseid = $ENV{'request.course.id'};
+        my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze',
+                                            'grade_domain' => $sdom,
+                                            'grade_username' => $sname,
+                                            'grade_symb' => $symb,
+                                            'grade_courseid' => $courseid));
+        (my $garbage,$analysis)=split(/_HASH_REF__/,$Answ,2);
+        &store_analysis($sname,$sdom,$symb,$analysis);
+    }
+    my %Answer=&Apache::lonnet::str2hash($analysis);
     #
-    undef($answer);
+    my $answer;
     foreach my $partid (@{$resource->{'parts'}}) {
         my $partdata = $resource->{'partdata'}->{$partid};
         foreach my $respid (@{$partdata->{'ResponseIds'}}) {
@@ -655,7 +656,6 @@ sub analyze_problem_as_student {
             $answer->{$partid}->{$respid} = &get_answer($prefix,$key,%Answer);
         }
     }
-    &store_answer($sname,$sdom,$symb,undef,undef,$answer);
     if (! defined($partid)) {
         $returnvalue = $answer;
     } elsif (! defined($respid)) {
@@ -700,7 +700,6 @@ sub get_answer {
     return $returnvalue;
 }
 
-
 #####################################################
 #####################################################
 
@@ -710,7 +709,7 @@ sub get_answer {
 
 =over 4
 
-=item &load_answer_cache($symb)
+=item &load_analysis_cache($symb)
 
 Loads the cache for the given symb into memory from disk.  
 Requires the cache filename be set.  
@@ -725,7 +724,7 @@ Only should be called by &ensure_proper_
     my $current_symb = undef;
     my %cache;
 
-sub load_answer_cache {
+sub load_analysis_cache {
     my ($symb) = @_;
     return if (! defined($cache_filename));
     if (! defined($current_symb) || $current_symb ne $symb) {
@@ -748,34 +747,20 @@ sub load_answer_cache {
 
 =pod
 
-=item &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid)
+=item &get_from_analysis_cache($sname,$sdom,$symb,$partid,$respid)
 
 Returns the appropriate data from the cache, or undef if no data exists.
-If $respid is undefined, a hash ref containing the answers for the given 
-$partid is returned.  If $partid is undefined, a hash ref containing answers
-for all of the parts is returned.
 
 =cut
 
 #####################################################
 #####################################################
-sub get_from_answer_cache {
-    my ($sname,$sdom,$symb,$partid,$respid) = @_;
+sub get_from_analysis_cache {
+    my ($sname,$sdom,$symb) = @_;
     &ensure_proper_cache($symb);
     my $returnvalue;
-    if (exists($cache{$sname.':'.$sdom}) &&
-        ref($cache{$sname.':'.$sdom}) eq 'HASH') {
-        if (defined($partid) &&
-            exists($cache{$sname.':'.$sdom}->{$partid})) {
-            if (defined($respid) &&
-                exists($cache{$sname.':'.$sdom}->{$partid}->{$respid})) {
-                $returnvalue = $cache{$sname.':'.$sdom}->{$partid}->{$respid};
-            } else {
-                $returnvalue = $cache{$sname.':'.$sdom}->{$partid};
-            }
-        } else {
-            $returnvalue = $cache{$sname.':'.$sdom};
-        }
+    if (exists($cache{$sname.':'.$sdom})) {
+        $returnvalue = $cache{$sname.':'.$sdom};
     } else {
         $returnvalue = undef;
     }
@@ -787,16 +772,16 @@ sub get_from_answer_cache {
 
 =pod
 
-=item &write_answer_cache($symb)
+=item &write_analysis_cache($symb)
 
 Writes the in memory cache to disk so that it can be read in with
-&load_answer_cache($symb).
+&load_analysis_cache($symb).
 
 =cut
 
 #####################################################
 #####################################################
-sub write_answer_cache {
+sub write_analysis_cache {
     return if (! defined($current_symb) || ! defined($cache_filename));
     my %cache_db;
     my $key = &Apache::lonnet::escape($current_symb);
@@ -820,7 +805,7 @@ sub write_answer_cache {
 =item &ensure_proper_cache($symb)
 
 Called to make sure we have the proper cache set up.  This is called
-prior to every answer lookup.
+prior to every analysis lookup.
 
 =cut
 
@@ -830,16 +815,16 @@ sub ensure_proper_cache {
     my ($symb) = @_;
     my $cid = $ENV{'request.course.id'};
     my $new_filename =  '/home/httpd/perl/tmp/'.
-        'problemanalysis_'.$cid.'_answer_cache.db';
+        'problemanalysis_'.$cid.'_analysis_cache.db';
     if (! defined($cache_filename) ||
         $cache_filename ne $new_filename ||
         ! defined($current_symb)   ||
         $current_symb ne $symb) {
         $cache_filename = $new_filename;
         # Notice: $current_symb is not set to $symb until after the cache is
-        # loaded.  This is what tells &load_answer_cache to load in a new
+        # loaded.  This is what tells &load_analysis_cache to load in a new
         # symb cache.
-        &load_answer_cache($symb);
+        &load_analysis_cache($symb);
         $current_symb = $symb;
     }
 }
@@ -849,26 +834,18 @@ sub ensure_proper_cache {
 
 =pod
 
-=item &store_answer($sname,$sdom,$symb,$partid,$respid,$dataset)
+=item &store_analysis($sname,$sdom,$symb,$partid,$respid,$dataset)
 
-Stores the answer data in the in memory cache.
+Stores the analysis data in the in memory cache.
 
 =cut
 
 #####################################################
 #####################################################
-sub store_answer {
-    my ($sname,$sdom,$symb,$partid,$respid,$dataset) = @_;
+sub store_analysis {
+    my ($sname,$sdom,$symb,$dataset) = @_;
     return if ($symb ne $current_symb);
-    if (defined($partid)) {
-        if (defined($respid)) {
-            $cache{$sname.':'.$sdom}->{$partid}->{$respid} = $dataset;
-        } else {
-            $cache{$sname.':'.$sdom}->{$partid} = $dataset;
-        }
-    } else {
-        $cache{$sname.':'.$sdom}=$dataset;
-    }
+    $cache{$sname.':'.$sdom}=$dataset;
     return;
 }
 
@@ -1108,13 +1085,15 @@ sub get_problem_data {
                     $Partdata{$part}->{'_Options'}=$value;
                 } elsif ($key eq 'concepts') {
                     $Partdata{$part}->{'_Concepts'}=$value;
+                } elsif ($key eq 'items') {
+                    $Partdata{$part}->{'_Items'}=$value;
                 } elsif ($key =~ /^concept\.(.*)$/) {
                     my $concept = $1;
                     foreach my $foil (@$value) {
                         $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}=
                                                                       $concept;
                     }
-                } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) {
+                } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high|str_type)$/) {
                     $Partdata{$part}->{$key}=$value;
                 }
             } else {
@@ -1126,13 +1105,51 @@ sub get_problem_data {
                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
                     my $foil = $1;
                     $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value;
+                } elsif ($key eq 'answercomputed') {
+                    $Partdata{$part}->{'answercomputed'} = $value;
                 }
             }
         }
     }
+    # Further debugging code
+    if (0) {
+        &Apache::lonnet::logthis('lonstathelpers::get_problem_data');
+        &log_hash_ref(\%Partdata);
+    }
     return %Partdata;
 }
 
+sub log_array_ref {
+    my ($arrayref,$prefix) = @_;
+    return if (ref($arrayref) ne 'ARRAY');
+    if (! defined($prefix)) { $prefix = ''; };
+    foreach my $v (@$arrayref) {
+        if (ref($v) eq 'ARRAY') {
+            &log_array_ref($v,$prefix.'  ');
+        } elsif (ref($v) eq 'HASH') {
+            &log_hash_ref($v,$prefix.'  ');
+        } else {
+            &Apache::lonnet::logthis($prefix.'"'.$v.'"');
+        }
+    }
+}
+
+sub log_hash_ref {
+    my ($hashref,$prefix) = @_;
+    return if (ref($hashref) ne 'HASH');
+    if (! defined($prefix)) { $prefix = ''; };
+    while (my ($k,$v) = each(%$hashref)) {
+        if (ref($v) eq 'ARRAY') {
+            &Apache::lonnet::logthis($prefix.'"'.$k.'" = array');
+            &log_array_ref($v,$prefix.'  ');
+        } elsif (ref($v) eq 'HASH') {
+            &Apache::lonnet::logthis($prefix.'"'.$k.'" = hash');
+            &log_hash_ref($v,$prefix.'  ');
+        } else {
+            &Apache::lonnet::logthis($prefix.'"'.$k.'" => "'.$v.'"');
+        }
+    }
+}
 ####################################################
 ####################################################