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

Diff for /loncom/interface/loncoursedata.pm between versions 1.72 and 1.78

version 1.72, 2003/05/27 15:48:12 version 1.78, 2003/06/17 21:45:36
Line 109  sub get_sequence_assessment_data { Line 109  sub get_sequence_assessment_data {
     if (!defined($navmap)) {      if (!defined($navmap)) {
         return 'Can not open Coursemap';          return 'Can not open Coursemap';
     }      }
       # We explicity grab the top level map because I am not sure we
       # are pulling it from the iterator.
       my $top_level_map = $navmap->getById('0.0');
       #
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $curRes = $iterator->next(); # Top level sequence      my $curRes = $iterator->next(); # Top level sequence
     ##      ##
Line 118  sub get_sequence_assessment_data { Line 122  sub get_sequence_assessment_data {
     ## resources.  This means we have to start out with something to look      ## resources.  This means we have to start out with something to look
     ## at.      ## at.
     my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};      my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
     my $symb  = 'top';      my $symb  = $top_level_map->symb();
     my $src   = 'not applicable';      my $src   = $top_level_map->src();
       my $randompick = $top_level_map->randompick();
     #      #
     my @Sequences;       my @Sequences; 
     my @Assessments;      my @Assessments;
Line 130  sub get_sequence_assessment_data { Line 135  sub get_sequence_assessment_data {
                 type     => 'container',                  type     => 'container',
                 num_assess => 0,                  num_assess => 0,
                 num_assess_parts => 0,                  num_assess_parts => 0,
                 contents   => [], };                  contents   => [], 
                   randompick => $randompick,
               };
     push (@Sequences,$top);      push (@Sequences,$top);
     push (@Nested_Sequences, $top);      push (@Nested_Sequences, $top);
     #      #
     # We need to keep track of which sequences contain homework problems      # We need to keep track of which sequences contain homework problems
     #       # 
       my $previous_too;
     my $previous;      my $previous;
     while (scalar(@Nested_Sequences)) {      while (scalar(@Nested_Sequences)) {
           $previous_too = $previous;
         $previous = $curRes;          $previous = $curRes;
         $curRes = $iterator->next();          $curRes = $iterator->next();
         my $currentmap = $Nested_Sequences[-1]; # Last one on the stack          my $currentmap = $Nested_Sequences[-1]; # Last one on the stack
         if ($curRes == $iterator->BEGIN_MAP()) {          if ($curRes == $iterator->BEGIN_MAP()) {
               if (! ref($previous)) {
                   $previous = $previous_too;
               }
               if (! ref($previous)) {
                   next;
               }
             # get the map itself, instead of BEGIN_MAP              # get the map itself, instead of BEGIN_MAP
             $title = $previous->title();              $title = $previous->title();
             $symb  = $previous->symb();              $symb  = $previous->symb();
             $src   = $previous->src();              $src   = $previous->src();
               $randompick = $previous->randompick();
             my $newmap = { title    => $title,              my $newmap = { title    => $title,
                            src      => $src,                             src      => $src,
                            symb     => $symb,                             symb     => $symb,
                            type     => 'container',                             type     => 'container',
                            num_assess => 0,                             num_assess => 0,
                              randompick => $randompick,
                            contents   => [],                             contents   => [],
                        };                         };
             push (@{$currentmap->{'contents'}},$newmap); # this is permanent              push (@{$currentmap->{'contents'}},$newmap); # this is permanent
Line 455  sub init_dbs { Line 472  sub init_dbs {
     my $courseid = shift;      my $courseid = shift;
     &setup_table_names($courseid);      &setup_table_names($courseid);
     #      #
       # Drop any of the existing tables
       foreach my $table ($symb_table,$part_table,$student_table,
                          $updatetime_table,$performance_table,
                          $parameters_table) {
           &Apache::lonmysql::drop_table($table);
       }
       #
     # Note - changes to this table must be reflected in the code that       # Note - changes to this table must be reflected in the code that 
     # stores the data (calls &Apache::lonmysql::store_row with this table      # stores the data (calls &Apache::lonmysql::store_row with this table
     # id      # id
Line 527  sub init_dbs { Line 551  sub init_dbs {
                     { name => 'part_id',                      { name => 'part_id',
                       type => 'MEDIUMINT UNSIGNED',                        type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },                        restrictions => 'NOT NULL' },
                       { name => 'part',
                         type => 'VARCHAR(100)',
                         restrictions => 'NOT NULL'},                    
                     { name => 'solved',                      { name => 'solved',
                       type => 'TINYTEXT' },                        type => 'TINYTEXT' },
                     { name => 'tries',                      { name => 'tries',
Line 945  sub update_student_data { Line 972  sub update_student_data {
             my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};              my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};
             my $timestamp = $param_hash->{'timestamp'};              my $timestamp = $param_hash->{'timestamp'};
             #              #
             $solved      = '' if (! defined($awarded));              $solved      = '' if (! defined($solved));
             $tries       = '' if (! defined($tries));              $tries       = '' if (! defined($tries));
             $awarded     = '' if (! defined($awarded));              $awarded     = '' if (! defined($awarded));
             $award       = '' if (! defined($award));              $award       = '' if (! defined($award));
             $awarddetail = '' if (! defined($awarddetail));              $awarddetail = '' if (! defined($awarddetail));
             $newstring = "('".join("','",$symb_id,$student_id,$part_id,              $newstring = "('".join("','",$symb_id,$student_id,$part_id,$part,
                                    $solved,$tries,$awarded,$award,                                     $solved,$tries,$awarded,$award,
                                    $awarddetail,$timestamp)."'),\n";                                     $awarddetail,$timestamp)."'),\n";
             $store_performance_command .= $newstring;              $store_performance_command .= $newstring;
Line 1094  sub get_student_data_from_performance_ca Line 1121  sub get_student_data_from_performance_ca
     #      #
     my $dbh = &Apache::lonmysql::get_dbh();      my $dbh = &Apache::lonmysql::get_dbh();
     my $request = "SELECT ".      my $request = "SELECT ".
         "d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".          "d.symb,a.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".
             "a.timestamp ";              "a.timestamp ";
     if (defined($student)) {      if (defined($student)) {
         $request .= "FROM $student_table AS b ".          $request .= "FROM $student_table AS b ".
             "LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".              "LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".
             "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".  #            "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".
             "LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ".              "LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ".
                 "WHERE student='$student'";                  "WHERE student='$student'";
         if (defined($symb) && $symb ne '') {          if (defined($symb) && $symb ne '') {
Line 1108  sub get_student_data_from_performance_ca Line 1135  sub get_student_data_from_performance_ca
     } elsif (defined($symb) && $symb ne '') {      } elsif (defined($symb) && $symb ne '') {
         $request .= "FROM $symb_table as d ".          $request .= "FROM $symb_table as d ".
             "LEFT JOIN $performance_table AS a ON d.symb_id=a.symb_id ".              "LEFT JOIN $performance_table AS a ON d.symb_id=a.symb_id ".
             "LEFT JOIN $part_table    AS c ON c.part_id = a.part_id ".  #            "LEFT JOIN $part_table    AS c ON c.part_id = a.part_id ".
             "LEFT JOIN $student_table AS b ON b.student_id = a.student_id ".              "LEFT JOIN $student_table AS b ON b.student_id = a.student_id ".
                 "WHERE symb='".$dbh->quote($symb)."'";                  "WHERE symb='".$dbh->quote($symb)."'";
     }      }
Line 1186  sub get_current_state { Line 1213  sub get_current_state {
     return () if (! defined($sname) || ! defined($sdom));      return () if (! defined($sname) || ! defined($sdom));
     #      #
     my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);      my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);
     &Apache::lonnet::logthis  #    &Apache::lonnet::logthis
         ('sname = '.$sname.  #        ('sname = '.$sname.
          ' domain = '.$sdom.  #         ' domain = '.$sdom.
          ' status = '.$status.  #         ' status = '.$status.
          ' data is '.(defined($data)?'defined':'undefined'));  #         ' data is '.(defined($data)?'defined':'undefined'));
   #    while (my ($symb,$hash) = each(%$data)) {
   #        &Apache::lonnet::logthis($symb."\n----------------------------------");
   #        while (my ($key,$value) = each (%$hash)) {
   #            &Apache::lonnet::logthis("   ".$key." = ".$value);
   #        }
   #    }
     #      #
     if (defined($data)) {      if (defined($data)) {
         if (defined($symb)) {          if (defined($symb)) {
Removed from v.1.72  
changed lines
  Added in v.1.78

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