version 1.72, 2003/05/27 15:48:12
|
version 1.73, 2003/06/02 16:57:41
|
Line 455 sub init_dbs {
|
Line 455 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 534 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 950 sub update_student_data {
|
Line 960 sub update_student_data {
|
$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 1104 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 1118 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 1191 sub get_current_state {
|
Line 1201 sub get_current_state {
|
' 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)) { |