[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /misc refresh_courseids_db.pl

[raeburn]

raeburn		Sun Aug  1 03:57:32 2010 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
    /loncom/misc	refresh_courseids_db.pl 
  Log:
  - Counter for anonymous survey submissions moved from nohist_resourcetracker.db
    to nohist_anonsurveys.db for course (keys are $symb\0$part) to facilitate 
    use in statistics.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.471 loncom/homework/structuretags.pm:1.472
--- loncom/homework/structuretags.pm:1.471	Thu Jul 29 21:16:40 2010
+++ loncom/homework/structuretags.pm	Sun Aug  1 03:57:27 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.471 2010/07/29 21:16:40 raeburn Exp $
+# $Id: structuretags.pm,v 1.472 2010/08/01 03:57:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -649,7 +649,7 @@
 
 sub store_aggregates {
     my ($symb,$courseid) = @_;
-    my %aggregate;
+    my (%aggregate,%anoncounter);
     my @parts;
     my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -680,7 +680,7 @@
         }
         if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') || 
             ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred')) {
-            $aggregate{$symb."\0".$part."\0anonymous"} = 1;
+            $anoncounter{$symb."\0".$part} = 1;
             my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
             if ($needsrelease) {   
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
@@ -700,6 +700,10 @@
 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                             $cdomain,$cname);
     }
+    if (keys(%anoncounter) > 0) {
+        &Apache::lonnet::cinc('nohist_anonsurveys',\%anoncounter,
+                            $cdomain,$cname);
+    }
 }
 
 sub checkout_msg {
Index: loncom/misc/refresh_courseids_db.pl
diff -u loncom/misc/refresh_courseids_db.pl:1.6 loncom/misc/refresh_courseids_db.pl:1.7
--- loncom/misc/refresh_courseids_db.pl:1.6	Fri Jul 30 17:46:12 2010
+++ loncom/misc/refresh_courseids_db.pl	Sun Aug  1 03:57:32 2010
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 #
-# $Id: refresh_courseids_db.pl,v 1.6 2010/07/30 17:46:12 raeburn Exp $
+# $Id: refresh_courseids_db.pl,v 1.7 2010/08/01 03:57:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -375,7 +375,7 @@
     my ($cnum,$cdom,$reqdmajor,$reqdminor) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (defined($navmap)) {
-        my %resourcetracker =  &Apache::lonnet::dump('nohist_resourcetracker',
+        my %anonsubmissions =  &Apache::lonnet::dump('nohist_anonsurveys',
                                                      $cdom,$cnum);
         my %allresponses;
         my $anonsurv_subm;
@@ -388,7 +388,7 @@
             my @parts = @{$res->parts()};
             my $symb = $res->symb();
             foreach my $part (@parts) {
-                if (exists($resourcetracker{$symb."\0".$part."\0anonymous"})) {
+                if (exists($anonsubmissions{$symb."\0".$part})) {
                     $anonsurv_subm = 1;
                 }
             }