[LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemstatistics.pm /metadata_database/LONCAPA lonmetadata.pm

[www]

www		Thu Mar 15 20:53:27 2012 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemstatistics.pm 
    /loncom/metadata_database/LONCAPA	lonmetadata.pm 
  Log:
  Part of Bug #6576: store part and instance info for statistics
  
  
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.120 loncom/interface/statistics/lonproblemstatistics.pm:1.121
--- loncom/interface/statistics/lonproblemstatistics.pm:1.120	Wed Dec 21 21:25:51 2011
+++ loncom/interface/statistics/lonproblemstatistics.pm	Thu Mar 15 20:53:18 2012
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.120 2011/12/21 21:25:51 www Exp $
+# $Id: lonproblemstatistics.pm,v 1.121 2012/03/15 20:53:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1589,7 +1589,6 @@
         $data->{'sections'}=$sections;
         $data->{'course'} = $env{'request.course.id'};
         my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
-        $data->{'urlres'}=$urlres;
         my %storestats =
             &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
         my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});
Index: loncom/metadata_database/LONCAPA/lonmetadata.pm
diff -u loncom/metadata_database/LONCAPA/lonmetadata.pm:1.35 loncom/metadata_database/LONCAPA/lonmetadata.pm:1.36
--- loncom/metadata_database/LONCAPA/lonmetadata.pm:1.35	Wed Mar 14 20:53:56 2012
+++ loncom/metadata_database/LONCAPA/lonmetadata.pm	Thu Mar 15 20:53:27 2012
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonmetadata.pm,v 1.35 2012/03/14 20:53:56 www Exp $
+# $Id: lonmetadata.pm,v 1.36 2012/03/15 20:53:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -974,18 +974,18 @@
     my $courseid = $data->{'course'};
     my $sections = $data->{'sections'};
     my $numstu = $data->{'num_students'};
-    my $urlres = $data->{'urlres'};
-    my $key = $courseid.'&'.$sections.'&'.$numstu.'___'.$urlres.'___stats';
+    my $part = $data->{'part'};
+    my $symb = $data->{'symb'};
+    my $key = $courseid.'&'.$sections.'&'.$numstu.'&'.$part.'___'.$symb.'___stats';
     $Store{$key} =
         'course='.$courseid.'&'.
         'sections='.$sections.'&'.
         'timestamp='.time.'&'.
-        'stdno='.$data->{'num_students'}.'&'.
+        'part='.$part.'&'.
+        'stdno='.$numstu.'&'.
         'avetries='.$data->{'mean_tries'}.'&'.
-        'difficulty='.$data->{'deg_of_diff'};
-    if (exists($data->{'deg_of_disc'})) {
-        $Store{$key} .= '&'.'disc='.$data->{'deg_of_disc'};
-    }
+        'difficulty='.$data->{'deg_of_diff'}.'&'.
+        'disc='.$data->{'deg_of_disc'};
     return %Store;
 }