--- loncom/interface/statistics/lonproblemstatistics.pm	2006/05/05 20:03:43	1.108
+++ loncom/interface/statistics/lonproblemstatistics.pm	2008/09/11 14:47:22	1.113
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.108 2006/05/05 20:03:43 raeburn Exp $
+# $Id: lonproblemstatistics.pm,v 1.113 2008/09/11 14:47:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,8 @@ use Apache::lonlocal;
 use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();
 use Time::HiRes;
+use LONCAPA;
+ 
 
 my @StatsArray;
 my %SeqStat;    # keys are symbs, values are hash refs
@@ -614,7 +616,7 @@ sub CreateInterface {
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Statistics').'</b></td>';
     $Str .= '<td rowspan="2">'.
@@ -712,7 +714,7 @@ sub BuildProblemStatisticsPage {
                   '</h3><p>'.
                   &mt('It may take some time to update the student data '.
                       'for the first analysis.  Future analysis this session '.
-                      ' will not have this delay.').
+                      'will not have this delay.').
                   '</p>');
 	&clean_up();
         return;
@@ -726,7 +728,7 @@ sub BuildProblemStatisticsPage {
     ($navmap,@sequences) = 
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
-        $r->print('<h1>'.&mt('A course-wide error occured.').'</h1>'.
+        $r->print('<h1>'.&mt('A course-wide error occurred.').'</h1>'.
                   '<h3>'.$navmap.'</h3>');
 	&clean_up();
         return;
@@ -1565,7 +1567,7 @@ sub get_statistics {
     $data->{'container'}   = $sequence->compTitle;
     $data->{'title'}       = $resource->compTitle;
     $data->{'title.link'}  = $resource->src.'?symb='.
-        &Apache::lonnet::escape($resource->symb);
+        &escape($resource->symb);
     #
     if ($SelectedFields{'deg_of_disc'}) {
         $data->{'deg_of_disc'} = 
@@ -1583,7 +1585,7 @@ sub get_statistics {
         $data->{'urlres'}=$urlres;
         my %storestats = 
             &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
-        my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/; 
+        my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)}); 
         &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
     }
     #
@@ -1591,16 +1593,16 @@ sub get_statistics {
         ($data->{'num_solved'}+0.1);
     #
     # Get the due date for research purposes (commented out most of the time)
-#    $data->{'duedate'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);
-#    $data->{'opendate'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
-#    $data->{'maxtries'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
-#    $data->{'hinttries'} =
-#        &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
-    $data->{'weight'} =
-        &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+#    my $duedate = &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);;
+#    my $opendate = &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
+#    my $maxtries = &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
+#    my $hinttries = &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
+    my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+    $data->{'weight'} = $weight;
+#    $data->{'duedate'} = $duedate; 
+#    $data->{'opendate'} = $opendate;
+#    $data->{'maxtries'} = $maxtries;
+#    $data->{'hinttries'} = $hinttries;
 #    $data->{'resptypes'} = join(',',@{$resource->{'partdata'}->{$part}->{'ResponseTypes'}});
     return $data;
 }