[BACK]Return to loncoursedata.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncoursedata.pm between versions 1.112 and 1.127

version 1.112, 2004/01/19 16:31:25 version 1.127, 2004/03/23 16:35:15
Line 182  sub get_sequence_assessment_data { Line 182  sub get_sequence_assessment_data {
             next;              next;
         }          }
         next if (! ref($curRes));          next if (! ref($curRes));
         next if (! $curRes->is_problem());# && !$curRes->randomout);          next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/);
         # Okay, from here on out we only deal with assessments          # Okay, from here on out we only deal with assessments
         $title = $curRes->title();          $title = $curRes->title();
         $title =~ s/\:/\&\#058;/g;          $title =~ s/\:/\&\#058;/g;
Line 401  characters) and a KEY on 'part_id'. Line 401  characters) and a KEY on 'part_id'.
   
 =item $student_table  =item $student_table
   
 The student_table has two columns.  The first is a 'student_id' and the second  The student_table has 7 columns.  The first is a 'student_id' assigned by 
 is the text description of the 'student' (typically username:domain) (less  MySQL.  The second is 'student' which is username:domain.  The third through
 than 100 characters).  The 'student_id' is automatically generated by MySQL.  fifth are 'section', 'status' (enrollment status), and 'classification' 
 The use of the name 'student_id' is loaded, I know, but this ID is used ONLY   (to be used in the future).  The sixth and seventh ('updatetime' and 
 internally to the MySQL database and is not the same as the students ID   'fullupdatetime') contain the time of last update and full update of student
 (stored in the students environment).  This table has its PRIMARY KEY on the  data.  This table has its PRIMARY KEY on the 'student_id' column and is indexed
 'student' (100 characters).  on 'student', 'section', and 'status'.
   
 =item $studentdata_table  
   
 The studentdata_table has four columns:  'student_id' (the unique id of   
 the student), 'updatetime' (the time the students data was last updated),  
 'fullupdatetime' (the time the students full data was last updated),  
 'section', and 'classification'( the students current classification).  
 This table has its PRIMARY KEY on 'student_id'.  
   
 =back   =back 
   
Line 483  about both the response and part data. Line 475  about both the response and part data.
 'transaction', and 'timestamp'.    'transaction', and 'timestamp'.  
 The primary key is based on the first 3 columns.  The primary key is based on the first 3 columns.
   
   =item $weight_table
   
   The weight table holds the weight for the problems used in the class.
   Whereas the weight of a problem can vary by section and student the data
   here is applied to the class as a whole.
   Columns: 'symb_id','part_id','response_id','weight'.
   
 =back  =back
   
 =back  =back
Line 521  my $current_course =''; Line 520  my $current_course ='';
 my $symb_table;  my $symb_table;
 my $part_table;  my $part_table;
 my $student_table;  my $student_table;
 my $studentdata_table;  
 my $performance_table;  my $performance_table;
 my $parameters_table;  my $parameters_table;
 my $fulldump_response_table;  my $fulldump_response_table;
 my $fulldump_part_table;  my $fulldump_part_table;
 my $fulldump_timestamp_table;  my $fulldump_timestamp_table;
   my $weight_table;
   
 my @Tables;  my @Tables;
 ################################################  ################################################
Line 597  sub init_dbs { Line 596  sub init_dbs {
                       auto_inc     => 'yes', },                        auto_inc     => 'yes', },
                     { name => 'student',                      { name => 'student',
                       type => 'VARCHAR(100)',                        type => 'VARCHAR(100)',
                         restrictions => 'NOT NULL UNIQUE'},
                       { name => 'section',
                         type => 'VARCHAR(100)',
                         restrictions => 'NOT NULL'},
                       { name => 'status',
                         type => 'VARCHAR(15)',
                       restrictions => 'NOT NULL'},                        restrictions => 'NOT NULL'},
                     { name => 'classification',                      { name => 'classification',
                       type => 'varchar(100)', },                        type => 'varchar(100)', },
                     ],  
         'PRIMARY KEY' => ['student (100)'],  
         'KEY' => [{ columns => ['student_id']},],  
     };  
     #  
     my $studentdata_table_def = {  
         id => $studentdata_table,  
         permanent => 'no',  
         columns => [{ name => 'student_id',  
                       type => 'MEDIUMINT UNSIGNED',  
                       restrictions => 'NOT NULL UNIQUE',},  
                     { name => 'updatetime',                      { name => 'updatetime',
                       type => 'INT UNSIGNED'},                        type => 'INT UNSIGNED'},
                     { name => 'fullupdatetime',                      { name => 'fullupdatetime',
                       type => 'INT UNSIGNED'},                        type => 'INT UNSIGNED'},
                     { name => 'section',  
                       type => 'VARCHAR(100)'},  
                     { name => 'classification',  
                       type => 'VARCHAR(100)', },  
                     ],                      ],
         'PRIMARY KEY' => ['student_id'],          'PRIMARY KEY' => ['student_id'],
           'KEY' => [{ columns => ['student (100)',
                                   'section (100)',
                                   'status (15)',]},],
     };      };
     #      #
     my $performance_table_def = {      my $performance_table_def = {
Line 643  sub init_dbs { Line 636  sub init_dbs {
                     { name => 'tries',                      { name => 'tries',
                       type => 'SMALLINT UNSIGNED' },                        type => 'SMALLINT UNSIGNED' },
                     { name => 'awarded',                      { name => 'awarded',
                       type => 'TINYTEXT' },                        type => 'REAL' },
                     { name => 'award',                      { name => 'award',
                       type => 'TINYTEXT' },                        type => 'TINYTEXT' },
                     { name => 'awarddetail',                      { name => 'awarddetail',
Line 678  sub init_dbs { Line 671  sub init_dbs {
                     { name => 'award',                      { name => 'award',
                       type => 'TINYTEXT' },                        type => 'TINYTEXT' },
                     { name => 'awarded',                      { name => 'awarded',
                       type => 'TINYTEXT' },                        type => 'REAL' },
                     { name => 'previous',                      { name => 'previous',
                       type => 'SMALLINT UNSIGNED' },                        type => 'SMALLINT UNSIGNED' },
 #                    { name => 'regrader',  #                    { name => 'regrader',
Line 755  sub init_dbs { Line 748  sub init_dbs {
                   { columns=>['transaction'] },                    { columns=>['transaction'] },
                   ],                    ],
     };      };
   
     #      #
     my $parameters_table_def = {      my $parameters_table_def = {
         id => $parameters_table,          id => $parameters_table,
Line 775  sub init_dbs { Line 767  sub init_dbs {
         'PRIMARY KEY' => ['symb_id','student_id','parameter (255)'],          'PRIMARY KEY' => ['symb_id','student_id','parameter (255)'],
     };      };
     #      #
       my $weight_table_def = {
           id => $weight_table,
           permanent => 'no',
           columns => [{ name => 'symb_id',
                         type => 'MEDIUMINT UNSIGNED',
                         restrictions => 'NOT NULL'  },
                       { name => 'part_id',
                         type => 'MEDIUMINT UNSIGNED',
                         restrictions => 'NOT NULL'  },
                       { name => 'weight',
                         type => 'REAL',
                         restrictions => 'NOT NULL'  },
                       ],
           'PRIMARY KEY' => ['symb_id','part_id'],
       };
       #
     # Create the tables      # Create the tables
     my $tableid;      my $tableid;
     $tableid = &Apache::lonmysql::create_table($symb_table_def);      $tableid = &Apache::lonmysql::create_table($symb_table_def);
Line 798  sub init_dbs { Line 806  sub init_dbs {
         return 3;          return 3;
     }      }
     #      #
     $tableid = &Apache::lonmysql::create_table($studentdata_table_def);  
     if (! defined($tableid)) {  
         &Apache::lonnet::logthis("error creating studentdata_table: ".  
                                  &Apache::lonmysql::get_error());  
         return 4;  
     }  
     #  
     $tableid = &Apache::lonmysql::create_table($performance_table_def);      $tableid = &Apache::lonmysql::create_table($performance_table_def);
     if (! defined($tableid)) {      if (! defined($tableid)) {
         &Apache::lonnet::logthis("error creating preformance_table: ".          &Apache::lonnet::logthis("error creating preformance_table: ".
Line 838  sub init_dbs { Line 839  sub init_dbs {
                                  &Apache::lonmysql::get_error());                                   &Apache::lonmysql::get_error());
         return 9;          return 9;
     }      }
       $tableid = &Apache::lonmysql::create_table($weight_table_def);
       if (! defined($tableid)) {
           &Apache::lonnet::logthis("error creating weight_table: ".
                                    &Apache::lonmysql::get_error());
           return 10;
       }
     return 0;      return 0;
 }  }
   
Line 1041  sub get_student_id { Line 1048  sub get_student_id {
         $have_read_student_table = 1;          $have_read_student_table = 1;
     }      }
     if (! exists($ids_by_student{$student})) {      if (! exists($ids_by_student{$student})) {
         &Apache::lonmysql::store_row($student_table,          &populate_student_table();
                                      [undef,$student,undef]);  
         undef(%ids_by_student);          undef(%ids_by_student);
           undef(%students_by_id);
         my @Result = &Apache::lonmysql::get_rows($student_table);          my @Result = &Apache::lonmysql::get_rows($student_table);
         foreach (@Result) {          foreach (@Result) {
             $ids_by_student{$_->[1]}=$_->[0];              $ids_by_student{$_->[1]}=$_->[0];
Line 1067  sub get_student { Line 1074  sub get_student {
     return undef; # error      return undef; # error
 }  }
   
   sub populate_student_table {
       my ($courseid) = @_;
       if (! defined($courseid)) {
           $courseid = $ENV{'request.course.id'};
       }
       #
       &setup_table_names($courseid);
       my $dbh = &Apache::lonmysql::get_dbh();
       my $request = 'INSERT IGNORE INTO '.$student_table.
           "(student,section,status) VALUES ";
       my $classlist = &get_classlist($courseid);
       my $student_count=0;
       while (my ($student,$data) = each %$classlist) {
           my ($section,$status) = ($data->[&CL_SECTION()],
                                    $data->[&CL_STATUS()]);
           if ($section eq '' || $section =~ /^\s*$/) {
               $section = 'none';
           }
           $request .= "('".$student."','".$section."','".$status."'),";
           $student_count++;
       }
       return if ($student_count == 0);
       chop($request);
       $dbh->do($request);
       if ($dbh->err()) {
           &Apache::lonnet::logthis("error ".$dbh->errstr().
                                    " occured executing \n".
                                    $request);
       }
       return;
   }
   
 ################################################  ################################################
 ################################################  ################################################
   
Line 1125  a description of the error. Line 1164  a description of the error.
 Once the "fulldump" tables are updated, the tables used for chart and  Once the "fulldump" tables are updated, the tables used for chart and
 spreadsheet (which hold only the current state of the student on their  spreadsheet (which hold only the current state of the student on their
 homework, not historical data) are updated.  If all updates have occured   homework, not historical data) are updated.  If all updates have occured 
 successfully, the studentdata table is updated to reflect the time of the  successfully, $student_table is updated to reflect the time of the update.
 update.  
   
 Notice we do not insert the data and immediately query it.  This means it  Notice we do not insert the data and immediately query it.  This means it
 is possible for there to be data returned this first time that is not   is possible for there to be data returned this first time that is not 
Line 1225  sub update_full_student_data { Line 1263  sub update_full_student_data {
                     # However, there is one wrinkle: submissions which end in                      # However, there is one wrinkle: submissions which end in
                     # and odd number of '\' cause insert errors to occur.                        # and odd number of '\' cause insert errors to occur.  
                     # Best trap this somehow...                      # Best trap this somehow...
                     $value =~ s/\'/\\\'/g;                      $value = $dbh->quote($value);
                     my ($offensive_string) = ($value =~ /(\\+)$/);  
                     if (length($offensive_string) % 2) {  
                         $value =~ s/\\$/\\\\/;  
                     }  
                 }                  }
                 if ($field eq 'submissiongrading' ||                   if ($field eq 'submissiongrading' || 
                     $field eq 'molecule') {                      $field eq 'molecule') {
Line 1321  sub update_full_student_data { Line 1355  sub update_full_student_data {
     ##      ##
     ## Update the students time......      ## Update the students time......
     if ($returnstatus eq 'okay') {      if ($returnstatus eq 'okay') {
         &Apache::lonmysql::replace_row          &store_updatetime($student_id,$time_of_retrieval,$time_of_retrieval);
             ($studentdata_table,          if ($dbh->err) {
              [$student_id,$time_of_retrieval,$time_of_retrieval,undef,undef]);              if ($returnstatus eq 'okay') {
                   $returnstatus = 'error updating student time';
               } else {
                   $returnstatus = 'error updating student time';
               }
           }
     }      }
     return $returnstatus;      return $returnstatus;
 }  }
Line 1391  sub update_student_data { Line 1430  sub update_student_data {
     #      #
     # Set the students update time      # Set the students update time
     if ($Results[0] eq 'okay') {      if ($Results[0] eq 'okay') {
         &Apache::lonmysql::replace_row($studentdata_table,          &store_updatetime($student_id,$time_of_retrieval,$time_of_retrieval);
                          [$student_id,$time_of_retrieval,undef,undef,undef]);  
     }      }
     #      #
     return @Results;      return @Results;
 }  }
   
   sub store_updatetime {
       my ($student_id,$updatetime,$fullupdatetime)=@_;
       my $values = '';
       if (defined($updatetime)) {
           $values = 'updatetime='.$updatetime.' ';
       }
       if (defined($fullupdatetime)) {
           if ($values ne '') {
               $values .= ',';
           }
           $values .= 'fullupdatetime='.$fullupdatetime.' ';
       }
       return if ($values eq '');
       my $dbh = &Apache::lonmysql::get_dbh();
       my $request = 'UPDATE '.$student_table.' SET '.$values.
           ' WHERE student_id='.$student_id.' LIMIT 1';
       $dbh->do($request);
   }
   
 sub store_student_data {  sub store_student_data {
     my ($sname,$sdom,$courseid,$student_data) = @_;      my ($sname,$sdom,$courseid,$student_data) = @_;
     #      #
Line 1517  sub ensure_tables_are_set_up { Line 1574  sub ensure_tables_are_set_up {
     #      #
     # if the tables do not exist, make them      # if the tables do not exist, make them
     my @CurrentTable = &Apache::lonmysql::tables_in_db();      my @CurrentTable = &Apache::lonmysql::tables_in_db();
     my ($found_symb,$found_student,$found_part,$found_studentdata,      my ($found_symb,$found_student,$found_part,
         $found_performance,$found_parameters,$found_fulldump_part,          $found_performance,$found_parameters,$found_fulldump_part,
         $found_fulldump_response,$found_fulldump_timestamp);          $found_fulldump_response,$found_fulldump_timestamp,
           $found_weight);
     foreach (@CurrentTable) {      foreach (@CurrentTable) {
         $found_symb        = 1 if ($_ eq $symb_table);          $found_symb        = 1 if ($_ eq $symb_table);
         $found_student     = 1 if ($_ eq $student_table);          $found_student     = 1 if ($_ eq $student_table);
         $found_part        = 1 if ($_ eq $part_table);          $found_part        = 1 if ($_ eq $part_table);
         $found_studentdata = 1 if ($_ eq $studentdata_table);  
         $found_performance = 1 if ($_ eq $performance_table);          $found_performance = 1 if ($_ eq $performance_table);
         $found_parameters  = 1 if ($_ eq $parameters_table);          $found_parameters  = 1 if ($_ eq $parameters_table);
         $found_fulldump_part      = 1 if ($_ eq $fulldump_part_table);          $found_fulldump_part      = 1 if ($_ eq $fulldump_part_table);
         $found_fulldump_response  = 1 if ($_ eq $fulldump_response_table);          $found_fulldump_response  = 1 if ($_ eq $fulldump_response_table);
         $found_fulldump_timestamp = 1 if ($_ eq $fulldump_timestamp_table);          $found_fulldump_timestamp = 1 if ($_ eq $fulldump_timestamp_table);
           $found_weight      = 1 if ($_ eq $weight_table);
     }      }
     if (!$found_symb        || !$found_studentdata ||       if (!$found_symb          || 
         !$found_student     || !$found_part   ||          !$found_student       || !$found_part              ||
         !$found_performance || !$found_parameters ||          !$found_performance   || !$found_parameters        ||
         !$found_fulldump_part || !$found_fulldump_response ||          !$found_fulldump_part || !$found_fulldump_response ||
         !$found_fulldump_timestamp ) {          !$found_fulldump_timestamp || !$found_weight ) {
         if (&init_dbs($courseid)) {          if (&init_dbs($courseid)) {
             return 'error';              return 'error';
         }          }
Line 1554  Input: $sname, $sdom, $courseid Line 1612  Input: $sname, $sdom, $courseid
 Output: $status, $data  Output: $status, $data
   
 This routine ensures the data for a given student is up to date.  This routine ensures the data for a given student is up to date.
 The $studentdata_table is queried to determine the time of the last update.    The $student_table is queried to determine the time of the last update.  
 If the students data is out of date, &update_student_data() is called.    If the students data is out of date, &update_student_data() is called.  
 The return values from the call to &update_student_data() are returned.  The return values from the call to &update_student_data() are returned.
   
Line 1576  sub ensure_current_data { Line 1634  sub ensure_current_data {
          $Apache::lonnet::perlvar{'lonUsersDir'});           $Apache::lonnet::perlvar{'lonUsersDir'});
     #      #
     my $student_id = &get_student_id($sname,$sdom);      my $student_id = &get_student_id($sname,$sdom);
     my @Result = &Apache::lonmysql::get_rows($studentdata_table,      my @Result = &Apache::lonmysql::get_rows($student_table,
                                              "student_id ='$student_id'");                                               "student_id ='$student_id'");
     my $data = undef;      my $data = undef;
     if (@Result) {      if (@Result) {
         $updatetime = $Result[0]->[1];          $updatetime = $Result[0]->[5];  # Ack!  This is dumb!
     }      }
     if ($modifiedtime > $updatetime) {      if ($modifiedtime > $updatetime) {
         ($status,$data) = &update_student_data($sname,$sdom,$courseid);          ($status,$data) = &update_student_data($sname,$sdom,$courseid);
Line 1601  Output: $status Line 1659  Output: $status
   
 This routine ensures the fulldata (the data from a lonnet::dump, not a  This routine ensures the fulldata (the data from a lonnet::dump, not a
 lonnet::currentdump) for a given student is up to date.  lonnet::currentdump) for a given student is up to date.
 The $studentdata_table is queried to determine the time of the last update.    The $student_table is queried to determine the time of the last update.  
 If the students fulldata is out of date, &update_full_student_data() is  If the students fulldata is out of date, &update_full_student_data() is
 called.    called.  
   
Line 1624  sub ensure_current_full_data { Line 1682  sub ensure_current_full_data {
          $Apache::lonnet::perlvar{'lonUsersDir'});           $Apache::lonnet::perlvar{'lonUsersDir'});
     #      #
     my $student_id = &get_student_id($sname,$sdom);      my $student_id = &get_student_id($sname,$sdom);
     my @Result = &Apache::lonmysql::get_rows($studentdata_table,      my @Result = &Apache::lonmysql::get_rows($student_table,
                                              "student_id ='$student_id'");                                               "student_id ='$student_id'");
     my $updatetime;      my $updatetime;
     if (@Result && ref($Result[0]) eq 'ARRAY') {      if (@Result && ref($Result[0]) eq 'ARRAY') {
         $updatetime = $Result[0]->[2];          $updatetime = $Result[0]->[6];
     }      }
     if (! defined($updatetime) || $modifiedtime > $updatetime) {      if (! defined($updatetime) || $modifiedtime > $updatetime) {
         $status = &update_full_student_data($sname,$sdom,$courseid);          $status = &update_full_student_data($sname,$sdom,$courseid);
Line 1839  populated and all local caching variable Line 1897  populated and all local caching variable
 properly.  This means you need to call &ensure_current_data for  properly.  This means you need to call &ensure_current_data for
 the students you are concerned with prior to calling this routine.  the students you are concerned with prior to calling this routine.
   
 Inputs: $students, $symb, $part, $courseid  Inputs: $Sections, $status, $symb, $part, $courseid, $starttime, $endtime
   
 =over 4  =over 4
   
 =item $students is an array of hash references.    =item $Sections Array ref containing section names for students.  
 Each hash must contain at least the 'username' and 'domain' of a student.  'all' is allowed to be the first (and only) item in the array.
   
   =item $status String describing the status of students
   
 =item $symb is the symb for the problem.  =item $symb is the symb for the problem.
   
Line 1852  Each hash must contain at least the 'use Line 1912  Each hash must contain at least the 'use
   
 =item $courseid is the course id, of course!  =item $courseid is the course id, of course!
   
   =item $starttime and $endtime are unix times which to use to limit
   the statistical data.
   
 =back  =back
   
 Outputs: See the code for up to date information.  A hash reference is  Outputs: See the code for up to date information.  A hash reference is
Line 1887  able to answer it correctly. Line 1950  able to answer it correctly.
 ################################################  ################################################
 ################################################  ################################################
 sub get_problem_statistics {  sub get_problem_statistics {
     my ($students,$symb,$part,$courseid) = @_;      my ($Sections,$status,$symb,$part,$courseid,$starttime,$endtime) = @_;
     return if (! defined($symb) || ! defined($part));      return if (! defined($symb) || ! defined($part));
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));      $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     #      #
Line 1899  sub get_problem_statistics { Line 1962  sub get_problem_statistics {
     my $dbh = &Apache::lonmysql::get_dbh();      my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));      return undef if (! defined($dbh));
     #      #
       # Clean out the table
     $dbh->do('DROP TABLE '.$stats_table);  # May return an error      $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     my $request =       my $request = 
         'CREATE TEMPORARY TABLE '.$stats_table.          'CREATE TEMPORARY TABLE '.$stats_table.' '.
             ' SELECT student_id,solved,award,awarded,tries FROM '.$performance_table.          'SELECT a.student_id,a.solved,a.award,a.awarded,a.tries '.
                 ' WHERE symb_id='.$symb_id.' AND part_id='.$part_id;          'FROM '.$performance_table.' AS a ';
     if (defined($students)) {      #
       # See if we need to include some requirements on the students
       if ((defined($Sections) && lc($Sections->[0]) ne 'all') || 
           (defined($status)   && lc($status)        ne 'any')) {
           $request .= 'NATURAL LEFT JOIN '.$student_table.' AS b ';
       }
       $request .= ' WHERE a.symb_id='.$symb_id.' AND a.part_id='.$part_id;
       #
       # Limit the students included to those specified
       if (defined($Sections) && lc($Sections->[0]) ne 'all') {
         $request .= ' AND ('.          $request .= ' AND ('.
             join(' OR ', map {'student_id='.              join(' OR ', map { "b.section='".$_."'" } @$Sections
                                   &get_student_id($_->{'username'},  
                                                   $_->{'domain'})  
                                   } @$students  
                  ).')';                   ).')';
     }      }
 #    &Apache::lonnet::logthis($request);      if (defined($status) && lc($status) ne 'any') {
           $request .= " AND b.status='".$status."'";
       }
       #
       # Limit by starttime and endtime
       my $time_requirements = undef;
       if (defined($starttime)) {
           $time_requirements .= 'a.timestamp>='.$starttime;
           if (defined($endtime)) {
               $time_requirements .= ' AND a.timestamp<='.$endtime;
           }
       } elsif (defined($endtime)) {
           $time_requirements .= 'a.timestamp<='.$endtime;
       }
       if (defined($time_requirements)) {
           $request .= ' AND '.$time_requirements;
       }
       #
       # Finally, execute the request to create the temporary table
     $dbh->do($request);      $dbh->do($request);
 #    &Apache::lonnet::logthis('request = '.$/.$request);      #
       # Collect the first suite of statistics
     $request = 'SELECT COUNT(*),SUM(tries),MAX(tries),AVG(tries),STD(tries) '.      $request = 'SELECT COUNT(*),SUM(tries),MAX(tries),AVG(tries),STD(tries) '.
         'FROM '.$stats_table;          'FROM '.$stats_table;
     my ($num,$tries,$mod,$mean,$STD) = &execute_SQL_request      my ($num,$tries,$mod,$mean,$STD) = &execute_SQL_request
         ($dbh,$request);          ($dbh,$request);
 #    &Apache::lonnet::logthis('request = '.$/.$request);  
     $request = 'SELECT SUM(awarded) FROM '.$stats_table;      $request = 'SELECT SUM(awarded) FROM '.$stats_table;
     my ($Solved) = &execute_SQL_request($dbh,$request);      my ($Solved) = &execute_SQL_request($dbh,$request);
 #    &Apache::lonnet::logthis('request = '.$/.$request);  
     $request = 'SELECT SUM(awarded) FROM '.$stats_table.      $request = 'SELECT SUM(awarded) FROM '.$stats_table.
         " WHERE solved='correct_by_override'";          " WHERE solved='correct_by_override'";
 #    &Apache::lonnet::logthis('request = '.$/.$request);  
     my ($solved) = &execute_SQL_request($dbh,$request);      my ($solved) = &execute_SQL_request($dbh,$request);
 #    $Solved = int($Solved);  
 #    $solved = int($solved);  
     #      #
     $num    = 0 if (! defined($num));      $num    = 0 if (! defined($num));
     $tries  = 0 if (! defined($tries));      $tries  = 0 if (! defined($tries));
Line 1937  sub get_problem_statistics { Line 2021  sub get_problem_statistics {
     $Solved = 0 if (! defined($Solved));      $Solved = 0 if (! defined($Solved));
     $solved = 0 if (! defined($solved));      $solved = 0 if (! defined($solved));
     #      #
       # Compute the more complicated statistics
     my $DegOfDiff = 'nan';      my $DegOfDiff = 'nan';
     $DegOfDiff = 1-($Solved)/$tries if ($tries>0);      $DegOfDiff = 1-($Solved)/$tries if ($tries>0);
       #
     my $SKEW = 'nan';      my $SKEW = 'nan';
     my $wrongpercent = 0;      my $wrongpercent = 0;
     if ($num > 0) {      if ($num > 0) {
Line 1949  sub get_problem_statistics { Line 2034  sub get_problem_statistics {
         $wrongpercent=int(10*100*($num-$Solved+$solved)/$num)/10;          $wrongpercent=int(10*100*($num-$Solved+$solved)/$num)/10;
     }      }
     #      #
 #    $dbh->do('DROP TABLE '.$stats_table);  # May return an error      # Drop the temporary table
       $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     #      #
     # Store in metadata      # Store in metadata
     #  
     if ($num) {      if ($num) {
  my %storestats=();   my %storestats=();
           #
         my $urlres=(&Apache::lonnet::decode_symb($symb))[2];          my $urlres=(&Apache::lonnet::decode_symb($symb))[2];
           #
  $storestats{$courseid.'___'.$urlres.'___timestamp'}=time;          $storestats{$courseid.'___'.$urlres.'___timestamp'}=time;       
  $storestats{$courseid.'___'.$urlres.'___stdno'}=$num;   $storestats{$courseid.'___'.$urlres.'___stdno'}=$num;
  $storestats{$courseid.'___'.$urlres.'___avetries'}=$mean;      $storestats{$courseid.'___'.$urlres.'___avetries'}=$mean;   
  $storestats{$courseid.'___'.$urlres.'___difficulty'}=$DegOfDiff;   $storestats{$courseid.'___'.$urlres.'___difficulty'}=$DegOfDiff;
           #
  $urlres=~/^(\w+)\/(\w+)/;    $urlres=~/^(\w+)\/(\w+)/; 
  &Apache::lonnet::put('nohist_resevaldata',\%storestats,$1,$2);    &Apache::lonnet::put('nohist_resevaldata',\%storestats,$1,$2); 
     }      }
     #      #
     # Return result      # Return result
     #  
     return { num_students => $num,      return { num_students => $num,
              tries        => $tries,               tries        => $tries,
              max_tries    => $mod,               max_tries    => $mod,
Line 1981  sub get_problem_statistics { Line 2065  sub get_problem_statistics {
              deg_of_diff  => $DegOfDiff };               deg_of_diff  => $DegOfDiff };
 }  }
   
   ##
   ## This is a helper for get_statistics
 sub execute_SQL_request {  sub execute_SQL_request {
     my ($dbh,$request)=@_;      my ($dbh,$request)=@_;
 #    &Apache::lonnet::logthis($request);  #    &Apache::lonnet::logthis($request);
Line 1993  sub execute_SQL_request { Line 2079  sub execute_SQL_request {
     return ();      return ();
 }  }
   
   ######################################################
   ######################################################
   
   =pod
   
   =item &populate_weight_table
   
   =cut
   
   ######################################################
   ######################################################
   sub populate_weight_table {
       my ($courseid) = @_;
       if (! defined($courseid)) {
           $courseid = $ENV{'request.course.id'};
       }
       #
       &setup_table_names($courseid);
       my ($top,$sequences,$assessments) = get_sequence_assessment_data();
       if (! defined($top) || ! ref($top)) {
           # There has been an error, better report it
           &Apache::lonnet::logthis('top is undefined');
           return;
       }
       #       Since we use lonnet::EXT to retrieve problem weights,
       #       to ensure current data we must clear the caches out.
       &Apache::lonnet::clear_EXT_cache_status();
       my $dbh = &Apache::lonmysql::get_dbh();
       my $request = 'INSERT IGNORE INTO '.$weight_table.
           "(symb_id,part_id,weight) VALUES ";
       my $weight;
       foreach my $res (@$assessments) {
           my $symb_id = &get_symb_id($res->{'symb'});
           foreach my $part (@{$res->{'parts'}}) {
               my $part_id = &get_part_id($part);
               $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
                                              $res->{'symb'},
                                              undef,undef,undef);
               if (!defined($weight) || ($weight eq '')) { 
                   $weight=1;
               }
               $request .= "('".$symb_id."','".$part_id."','".$weight."'),";
           }
       }
       $request =~ s/(,)$//;
   #    &Apache::lonnet::logthis('request = '.$/.$request);
       $dbh->do($request);
       if ($dbh->err()) {
           &Apache::lonnet::logthis("error ".$dbh->errstr().
                                    " occured executing \n".
                                    $request);
       }
       return;
   }
   
   ##########################################################
   ##########################################################
   
   =pod
   
   =item &limit_by_section_and_status
   
   Build SQL WHERE condition which limits the data collected by section and
   student status.
   
   Inputs: $Sections (array ref)
       $enrollment (string: 'any', 'expired', 'active')
       $tablename The name of the table that holds the student data
   
   Returns: $student_requirements,$enrollment_requirements
   
   =cut
   
   ##########################################################
   ##########################################################
   sub limit_by_section_and_status {
       my ($Sections,$enrollment,$tablename) = @_;
       my $student_requirements = undef;
       if ( (defined($Sections) && $Sections->[0] ne 'all')) {
           $student_requirements = '('.
               join(' OR ', map { $tablename.".section='".$_."'" } @$Sections
                    ).')';
       }
       #
       my $enrollment_requirements=undef;
       if (defined($enrollment) && $enrollment ne 'Any') {
           $enrollment_requirements = $tablename.".status='".$enrollment."'";
       }
       return ($student_requirements,$enrollment_requirements);
   }
   
   ######################################################
   ######################################################
   
   =pod
   
   =item rank_students_by_scores_on_resources
   
   Inputs: 
       $resources: array ref of hash ref.  Each hash ref needs key 'symb'.
       $Sections: array ref of sections to include,
       $enrollment: string,
       $courseid (may be omitted)
   
   Returns; An array of arrays.  The sub arrays contain a student name and
   their score on the resources.
   
   =cut
   
   ######################################################
   ######################################################
   sub RNK_student { return 0; };
   sub RNK_score   { return 1; };
   
   sub rank_students_by_scores_on_resources {
       my ($resources,$Sections,$enrollment,$courseid) = @_;
       return if (! defined($resources) || ! ref($resources) eq 'ARRAY');
       if (! defined($courseid)) {
           $courseid = $ENV{'request.course.id'};
       }
       #
       &setup_table_names($courseid);
       my $dbh = &Apache::lonmysql::get_dbh();
       my ($section_limits,$enrollment_limits)=
           &limit_by_section_and_status($Sections,$enrollment,'b');
       my $symb_limits = '('.join(' OR ',map {'a.symb_id='.&get_symb_id($_);
                                          } @$resources
                                  ).')';
       my $request = 'SELECT b.student,SUM(a.awarded*w.weight) AS score FROM '.
           $performance_table.' AS a '.
           'NATURAL LEFT JOIN '.$weight_table.' AS w '.
           'LEFT JOIN '.$student_table.' AS b ON a.student_id=b.student_id '.
           'WHERE ';
       if (defined($section_limits)) {
           $request .= $section_limits.' AND ';
       }
       if (defined($enrollment_limits)) {
           $request .= $enrollment_limits.' AND ';
       }
       if ($symb_limits ne '()') {
           $request .= $symb_limits.' AND ';
       }
       $request =~ s/( AND )$//;   # Remove extra conjunction
       $request =~ s/( WHERE )$//; # In case there were no limits placed on it
       $request .= ' GROUP BY a.student_id ORDER BY score';
       #&Apache::lonnet::logthis('request = '.$/.$request);
       my $sth = $dbh->prepare($request);
       $sth->execute();
       my $rows = $sth->fetchall_arrayref();
       return ($rows);
   }
   
   ########################################################
   ########################################################
   
   =pod
   
   =item &get_sum_of_scores
   
   Inputs: $resource (hash ref, needs {'symb'} key),
   $part, (the part id),
   $students (array ref, contents of array are scalars holding 'sname:sdom'),
   $courseid
   
   Returns: the sum of the score on the problem part over the students and the
      maximum possible value for the sum (taken from the weight table).
   
   =cut
   
   ########################################################
   ########################################################
   sub get_sum_of_scores {
       my ($resource,$part,$students,$courseid) = @_;
       if (! defined($courseid)) {
           $courseid = $ENV{'request.course.id'};
       }
       #
       &setup_table_names($courseid);
       my $dbh = &Apache::lonmysql::get_dbh();
       my $request = 'SELECT SUM(a.awarded*w.weight),SUM(w.weight) FROM '.
           $performance_table.' AS a '.
           'NATURAL LEFT JOIN '.$weight_table.' AS w ';
       $request .= 'WHERE a.symb_id='.&get_symb_id($resource->{'symb'}).
           ' AND a.part_id='.&get_part_id($part);
       if (defined($students)) {
           $request .= ' AND ('.
               join(' OR ',map {'a.student_id='.&get_student_id(split(':',$_));
                            } @$students).
                                ')';
       }
       my $sth = $dbh->prepare($request);
       $sth->execute();
       my $rows = $sth->fetchrow_arrayref();
       if ($dbh->err) {
           &Apache::lonnet::logthis('error = '.$dbh->errstr());
           return (undef,undef);
       }
       return ($rows->[0],$rows->[1]);
   }
   
   
   ######################################################
   ######################################################
   
   =pod
   
   =item get_student_data
   
   =cut
   
   ######################################################
   ######################################################
 sub get_student_data {  sub get_student_data {
     my ($students,$courseid) = @_;      my ($students,$courseid) = @_;
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));      $courseid = $ENV{'request.course.id'} if (! defined($courseid));
Line 2032  sub RD_tries         { return 5; } Line 2330  sub RD_tries         { return 5; }
 sub RD_sname         { return 6; }  sub RD_sname         { return 6; }
   
 sub get_response_data {  sub get_response_data {
     my ($students,$symb,$response,$courseid) = @_;      my ($Sections,$enrollment,$symb,$response,$courseid) = @_;
     return undef if (! defined($symb) ||       return undef if (! defined($symb) || 
                ! defined($response));                 ! defined($response));
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));      $courseid = $ENV{'request.course.id'} if (! defined($courseid));
Line 2043  sub get_response_data { Line 2341  sub get_response_data {
     #      #
     my $dbh = &Apache::lonmysql::get_dbh();      my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));      return undef if (! defined($dbh));
       #
       my ($student_requirements,$enrollment_requirements) = 
           &limit_by_section_and_status($Sections,$enrollment,'d');
     my $request = 'SELECT '.      my $request = 'SELECT '.
         'a.student_id, a.awarddetail, a.response_specific_value, '.          'a.student_id, a.awarddetail, a.response_specific_value, '.
         'a.submission, b.timestamp, c.tries, d.student '.          'a.submission, b.timestamp, c.tries, d.student '.
Line 2057  sub get_response_data { Line 2358  sub get_response_data {
         'ON a.student_id=d.student_id '.          'ON a.student_id=d.student_id '.
         'WHERE '.          'WHERE '.
         'a.symb_id='.$symb_id.' AND a.response_id='.$response_id;          'a.symb_id='.$symb_id.' AND a.response_id='.$response_id;
     if (defined($students)) {      if (defined($student_requirements) || defined($enrollment_requirements)) {
         $request .= ' AND ('.          $request .= ' AND ';
             join(' OR ', map {'a.student_id='.          if (defined($student_requirements)) {
                                   &get_student_id($_->{'username'},              $request .= $student_requirements.' AND ';
                                                   $_->{'domain'})          }
                               } @$students          if (defined($enrollment_requirements)) {
                  ).')';              $request .= $enrollment_requirements.' AND ';
           }
           $request =~ s/( AND )$//;
     }      }
     $request .= ' ORDER BY b.timestamp';      $request .= ' ORDER BY b.timestamp';
 #    &Apache::lonnet::logthis("request =\n".$request);  #    &Apache::lonnet::logthis("request =\n".$request);
Line 2075  sub get_response_data { Line 2378  sub get_response_data {
     }      }
     my $dataset = $sth->fetchall_arrayref();      my $dataset = $sth->fetchall_arrayref();
     if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {      if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
           # Clear the \'s from around the submission
           for (my $i =0;$i<scalar(@$dataset);$i++) {
               $dataset->[$i]->[3] =~ s/(\'$|^\')//g;
           }
         return $dataset;          return $dataset;
     }      }
 }  }
   
   
   sub RDs_awarddetail   { return 3; }
   sub RDs_submission    { return 2; }
   sub RDs_timestamp     { return 1; }
   sub RDs_tries         { return 0; }
   sub RDs_awarded       { return 4; }
   
   sub get_response_data_by_student {
       my ($student,$symb,$response,$courseid) = @_;
       return undef if (! defined($symb) || 
                        ! defined($response));
       $courseid = $ENV{'request.course.id'} if (! defined($courseid));
       #
       &setup_table_names($courseid);
       my $symb_id = &get_symb_id($symb);
       my $response_id = &get_part_id($response);
       #
       my $student_id = &get_student_id($student->{'username'},
                                        $student->{'domain'});
       #
       my $dbh = &Apache::lonmysql::get_dbh();
       return undef if (! defined($dbh));
       my $request = 'SELECT '.
           'c.tries, b.timestamp, a.submission, a.awarddetail, e.awarded '.
           'FROM '.$fulldump_response_table.' AS a '.
           'LEFT JOIN '.$fulldump_timestamp_table.' AS b '.
           'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.
           'a.transaction = b.transaction '.
           'LEFT JOIN '.$fulldump_part_table.' AS c '.
           'ON a.symb_id=c.symb_id AND a.student_id=c.student_id AND '.        
           'a.part_id=c.part_id AND a.transaction = c.transaction '.
           'LEFT JOIN '.$student_table.' AS d '.
           'ON a.student_id=d.student_id '.
           'LEFT JOIN '.$performance_table.' AS e '.
           'ON a.symb_id=e.symb_id AND a.part_id=e.part_id AND '.
           'a.student_id=e.student_id AND c.tries=e.tries '.
           'WHERE '.
           'a.symb_id='.$symb_id.' AND a.response_id='.$response_id.
           ' AND a.student_id='.$student_id.' ORDER BY b.timestamp';
   #    &Apache::lonnet::logthis("request =\n".$request);
       my $sth = $dbh->prepare($request);
       $sth->execute();
       if ($dbh->err) {
           &Apache::lonnet::logthis('error = '.$dbh->errstr());
           return undef;
       }
       my $dataset = $sth->fetchall_arrayref();
       if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
           # Clear the \'s from around the submission
           for (my $i =0;$i<scalar(@$dataset);$i++) {
               $dataset->[$i]->[2] =~ s/(\'$|^\')//g;
           }
           return $dataset;
       }
       return undef; # error occurred
   }
   
 sub RT_student_id { return 0; }  sub RT_student_id { return 0; }
 sub RT_awarded    { return 1; }  sub RT_awarded    { return 1; }
 sub RT_tries      { return 2; }  sub RT_tries      { return 2; }
Line 2132  sub get_response_time_data { Line 2496  sub get_response_time_data {
   
 =pod  =pod
   
   =item &get_student_scores($Sections,$Symbs,$enrollment,$courseid)
   
   =cut
   
   ################################################
   ################################################
   sub get_student_scores {
       my ($Sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_;
       $courseid = $ENV{'request.course.id'} if (! defined($courseid));
       &setup_table_names($courseid);
       my $dbh = &Apache::lonmysql::get_dbh();
       return (undef) if (! defined($dbh));
       my $tmptable = $courseid.'_temp_'.time;
       #
       my $symb_requirements;
       if (defined($Symbs)  && @$Symbs) {
           $symb_requirements = '('.
               join(' OR ', map{ "(a.symb_id='".&get_symb_id($_->{'symb'}).
                                 "' AND a.part_id='".&get_part_id($_->{'part'}).
                                 "')"
                                 } @$Symbs).')';
       }
       #
       my $student_requirements;
       if ( (defined($Sections) && $Sections->[0] ne 'all')) {
           $student_requirements = '('.
               join(' OR ', map { "b.section='".$_."'" } @$Sections
                    ).')';
       }
       #
       my $enrollment_requirements=undef;
       if (defined($enrollment) && $enrollment ne 'Any') {
           $enrollment_requirements = "b.status='".$enrollment."'";
       }
       #
       my $time_requirements = undef;
       if (defined($starttime)) {
           $time_requirements .= "a.timestamp>='".$starttime."'";
           if (defined($endtime)) {
               $time_requirements .= " AND a.timestamp<='".$endtime."'";
           }
       } elsif (defined($endtime)) {
           $time_requirements .= "a.timestamp<='".$endtime."'";
       }
       ##
       ##
       my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable.
           ' SELECT a.student_id,SUM(a.awarded) AS score FROM '.
           $performance_table.' AS a ';
       if (defined($student_requirements) || defined($enrollment_requirements)) {
           $request .= ' NATURAL LEFT JOIN '.$student_table.' AS b ';
       }
       if (defined($symb_requirements)      || 
           defined($student_requirements)   ||
           defined($enrollment_requirements) ) {
           $request .= ' WHERE ';
       }
       if (defined($symb_requirements)) {
           $request .= $symb_requirements.' AND ';
       }
       if (defined($student_requirements)) {
           $request .= $student_requirements.' AND ';
       }
       if (defined($enrollment_requirements)) {
           $request .= $enrollment_requirements.' AND ';
       }
       if (defined($time_requirements)) {
           $request .= $time_requirements.' AND ';
       }
       $request =~ s/ AND $//; # Strip of the trailing ' AND '.
       $request .= ' GROUP BY a.student_id';
   #    &Apache::lonnet::logthis("request = \n".$request);
       my $sth = $dbh->prepare($request);
       $sth->execute();
       if ($dbh->err) {
           &Apache::lonnet::logthis('error = '.$dbh->errstr());
           return undef;
       }
       $request = 'SELECT score,COUNT(*) FROM '.$tmptable.' GROUP BY score';
   #    &Apache::lonnet::logthis("request = \n".$request);
       $sth = $dbh->prepare($request);
       $sth->execute();
       if ($dbh->err) {
           &Apache::lonnet::logthis('error = '.$dbh->errstr());
           return undef;
       }
       my $dataset = $sth->fetchall_arrayref();
       return $dataset;
   }
   
   ################################################
   ################################################
   
   =pod
   
 =item &setup_table_names()  =item &setup_table_names()
   
 input: course id  input: course id
Line 2170  sub setup_table_names { Line 2629  sub setup_table_names {
     $symb_table        = $base_id.'_'.'symb';      $symb_table        = $base_id.'_'.'symb';
     $part_table        = $base_id.'_'.'part';      $part_table        = $base_id.'_'.'part';
     $student_table     = $base_id.'_'.'student';      $student_table     = $base_id.'_'.'student';
     $studentdata_table = $base_id.'_'.'studentdata';  
     $performance_table = $base_id.'_'.'performance';      $performance_table = $base_id.'_'.'performance';
     $parameters_table  = $base_id.'_'.'parameters';      $parameters_table  = $base_id.'_'.'parameters';
     $fulldump_part_table      = $base_id.'_'.'partdata';      $fulldump_part_table      = $base_id.'_'.'partdata';
     $fulldump_response_table  = $base_id.'_'.'responsedata';      $fulldump_response_table  = $base_id.'_'.'responsedata';
     $fulldump_timestamp_table = $base_id.'_'.'timestampdata';      $fulldump_timestamp_table = $base_id.'_'.'timestampdata';
       $weight_table             = $base_id.'_'.'weight';
     #      #
     @Tables = (      @Tables = (
                $symb_table,                 $symb_table,
                $part_table,                 $part_table,
                $student_table,                 $student_table,
                $studentdata_table,  
                $performance_table,                 $performance_table,
                $parameters_table,                 $parameters_table,
                $fulldump_part_table,                 $fulldump_part_table,
                $fulldump_response_table,                 $fulldump_response_table,
                $fulldump_timestamp_table,                 $fulldump_timestamp_table,
                  $weight_table,
                );                 );
     return;      return;
 }  }
Removed from v.1.112  
changed lines
  Added in v.1.127

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>