[Aimmath-commit] moodle/mod/math_assignment/db mysql.php,1.5,1.6 mysql.sql,1.4,1.5

[<ma...@us...>]

Update of /cvsroot/aimmath/moodle/mod/math_assignment/db
In directory sc8-pr-cvs1:/tmp/cvs-serv30468/mod/math_assignment/db

Modified Files:
	mysql.php mysql.sql 
Log Message:
Changed to one aim subject per course

Index: mysql.php
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/db/mysql.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mysql.php	18 Sep 2003 11:26:24 -0000	1.5
--- mysql.php	18 Sep 2003 23:57:57 -0000	1.6
***************
*** 20,23 ****
--- 20,35 ----
              $return = false;
      }
+     if ($oldversion < 2003091821) {
+         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment` DROP `aimsubject`"))
+             $return = false;
+         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` DROP PRIMARY KEY, DROP `id`"))
+             $return = false;
+         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` ADD `course` INT(10) UNSIGNED NOT NULL default '0' FIRST");
+         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` CHANGE `course` `course` INT(10) UNSIGNED NOT NULL default '0' FIRST");
+         if (!execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` ADD PRIMARY KEY (`course`)"))
+             $return = false;
+         execute_sql("ALTER TABLE `{$CFG->prefix}math_assignment_subject` COMMENT='AiM subject used by each course'");
+         execute_sql("DELETE FROM `{$CFG->prefix}config` WHERE `name`='math_assignment_teachers_choose_subject' or `name`='math_assignment_server_display'");
+     }
      return $return;
  }

Index: mysql.sql
===================================================================
RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/db/mysql.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mysql.sql	18 Sep 2003 11:26:24 -0000	1.4
--- mysql.sql	18 Sep 2003 23:57:57 -0000	1.5
***************
*** 13,17 ****
    `solutions` varchar(255) NOT NULL default '',
    `solutionsisurl` tinyint(1) NOT NULL default '1',
-   `aimsubject` int(10) NOT NULL default '0',
    `aimquiz` varchar(255) NOT NULL default '',
    `papergrade` int(10) unsigned NOT NULL default '0',
--- 13,16 ----
***************
*** 23,33 ****
  
  CREATE TABLE `prefix_math_assignment_subject` (
!   `id` int(10) unsigned NOT NULL auto_increment,
    `name` varchar(255) NOT NULL default '',
    `server` int(10) unsigned NOT NULL default '0',
    `password` varchar(255) NOT NULL default '',
! PRIMARY KEY (`id`),
  UNIQUE `UNIQUE` (`name`, `server`)
! ) TYPE=MyISAM COMMENT='AiM subjects used by math assignments';
  
  CREATE TABLE `prefix_math_assignment_server` (
--- 22,32 ----
  
  CREATE TABLE `prefix_math_assignment_subject` (
!   `course` int(10) unsigned NOT NULL default '0',
    `name` varchar(255) NOT NULL default '',
    `server` int(10) unsigned NOT NULL default '0',
    `password` varchar(255) NOT NULL default '',
! PRIMARY KEY (`course`),
  UNIQUE `UNIQUE` (`name`, `server`)
! ) TYPE=MyISAM COMMENT='AiM subject used by each course';
  
  CREATE TABLE `prefix_math_assignment_server` (
***************
*** 56,60 ****
  INSERT `prefix_config` SET `name`="math_assignment_grade_multiplier",`value`="1";
  INSERT `prefix_config` SET `name`="math_assignment_default_latex_output",`value`="0";
- INSERT `prefix_config` SET `name`="math_assignment_server_display", `value`="2";
  INSERT `prefix_config` SET `name`="math_assignment_aim_display", `value`="1";
- INSERT `prefix_config` SET `name`="math_assignment_teachers_choose_subject", `value`="1";
--- 55,57 ----