Index: lams_build/liblist.conf
===================================================================
RCS file: /usr/local/cvsroot/lams_build/Attic/liblist.conf,v
diff -u -r1.2 -r1.3
--- lams_build/liblist.conf 12 Jan 2007 04:59:05 -0000 1.2
+++ lams_build/liblist.conf 7 Jul 2009 00:52:17 -0000 1.3
@@ -1,2 +1,2 @@
-build_related = catalina,ehcache,httpunit,junit,middlegen,xdoclet,strutstestcase
-
+build_related = catalina,ehcache,httpunit,junit,middlegen,xdoclet,strutstestcase
+
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql,v
diff -u -r1.18 -r1.19
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 2 Jul 2009 09:55:59 -0000 1.18
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 7 Jul 2009 00:50:42 -0000 1.19
@@ -1,157 +1,157 @@
--- SQL statements to update from LAMS 2.2
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
--- LI-192 This script needs to be in updaters - before new tools are deployed
---ALTER TABLE lams_tool ADD COLUMN pedagogical_planner_url TEXT;
-
--- LDEV-1998 -------------
-ALTER TABLE lams_system_tool ADD COLUMN pedagogical_planner_url TEXT;
-UPDATE lams_system_tool SET pedagogical_planner_url='pedagogicalPlanner/initGrouping.do' WHERE system_tool_id=1;
-CREATE TABLE lams_planner_nodes (
- uid BIGINT(20) NOT NULL auto_increment,
- parent_uid BIGINT(20),
- order_id TINYINT UNSIGNED NOT NULL,
- locked TINYINT(1) NOT NULL DEFAULT 0,
- content_folder_id VARCHAR(32),
- title VARCHAR(255) NOT NULL,
- brief_desc TEXT,
- full_desc TEXT,
- file_uuid BIGINT(20) UNSIGNED,
- file_name VARCHAR(255),
- PRIMARY KEY (uid),
- UNIQUE KEY (parent_uid, order_id),
- CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid)
- REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
--- LDEV-2074 --------------
-ALTER TABLE lams_learning_design ADD COLUMN floating_activity_id BIGINT(20);
-CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC);
-INSERT INTO lams_learning_activity_type VALUES (15, 'FLOATING');
-
--- LDEV-1983 --------------
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0);
-
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
-
--- LDEV-2099 --------------
-ALTER TABLE lams_user ADD COLUMN lams_community_token VARCHAR(255);
-ALTER TABLE lams_user ADD COLUMN lams_community_username VARCHAR(255);
-
-CREATE TABLE lams_registration (
- uid BIGINT NOT NULL auto_increment
- , site_name VARCHAR(255) NOT NULL
- , organisation VARCHAR(255) NOT NULL
- , name VARCHAR(255) NOT NULL
- , email VARCHAR(255) NOT NULL
- , server_country VARCHAR(2) NOT NULL
- , public_directory TINYINT(1) DEFAULT 1
- , enable_lams_community TINYINT(1) DEFAULT 0
- , server_key VARCHAR(255) NOT NULL
- , server_id VARCHAR(255) NOT NULL
- , PRIMARY KEY (uid)
-)TYPE=InnoDB;
-
--- LDEV-2107 --------------
-INSERT into lams_workspace_folder_type VALUES (3, 'PUBLIC SEQUENCES');
-
--- LDEV-2115 --------------
-ALTER TABLE lams_progress_completed ADD COLUMN completed_date_time DATETIME;
-
--- LDEV-2173 -------------- Adding in start dates for activities for gradebook
-ALTER TABLE lams_progress_attempted ADD COLUMN start_date_time DATETIME;
-ALTER TABLE lams_progress_completed ADD COLUMN start_date_time DATETIME;
-
--- LDEV-2163 --------------
-CREATE TABLE lams_activity_evaluation (
- activity_evaluation_id BIGINT(20) NOT NULL auto_increment
- , activity_id BIGINT(20) NOT NULL
- , tool_output_definition VARCHAR(255) NOT NULL
- , INDEX (activity_id)
- , CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id)
- REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
- , PRIMARY KEY (activity_evaluation_id)
-)TYPE=InnoDB;
-
--- LDEV-2174 -------------
-ALTER TABLE lams_tool DROP COLUMN classpath_addition;
-ALTER TABLE lams_tool DROP COLUMN context_file;
-
--- LDEV-2205 ------------ Adding couse level settings for gradebook
-ALTER TABLE lams_organisation ADD COLUMN enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE lams_organisation ADD COLUMN enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0;
-
--- LDEV-2173 ------------ Gradebook stuff
-CREATE TABLE lams_gradebook_user_activity (
- uid BIGINT(20) NOT NULL auto_increment
- , activity_id BIGINT(20) NOT NULL
- , user_id BIGINT (20) NOT NULL
- , mark DOUBLE PRECISION
- , marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0
- , feedback TEXT
- , INDEX (activity_id, user_id)
- , CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id)
- REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id)
- REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
- , PRIMARY KEY (uid)
-)TYPE=InnoDB;
-
-CREATE TABLE lams_gradebook_user_lesson (
- uid BIGINT(20) NOT NULL auto_increment
- , lesson_id BIGINT(20) NOT NULL
- , user_id BIGINT (20) NOT NULL
- , mark DOUBLE PRECISION
- , feedback TEXT
- , INDEX (lesson_id, user_id)
- , CONSTRAINT FK_lams_gradebook_user_lesson_1 FOREIGN KEY (lesson_id)
- REFERENCES lams_lesson (lesson_id)
- , CONSTRAINT FK_lams_gradebook_user_lesson_2 FOREIGN KEY (user_id)
- REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
- , PRIMARY KEY (uid)
-)TYPE=InnoDB;
-
--- LDEV-2207 ------------ Adding flag in lesson to release marks for gradebook
-ALTER TABLE lams_lesson ADD COLUMN marks_released TINYINT DEFAULT 0;
-
--- LDEV-2165
-ALTER TABLE lams_events modify COLUMN name VARCHAR(128) NOT NULL;
-ALTER TABLE lams_events modify COLUMN scope VARCHAR(128) NOT NULL;
-
--- LDEV-2125 -------------
-ALTER TABLE lams_user ADD COLUMN timezone TINYINT;
-
--- LDEV-2054
-ALTER TABLE lams_grouping ADD COLUMN view_students_before_selection TINYINT DEFAULT 0;
-
--- LDEV-2197 ------------ Presence Chat Logging
-CREATE TABLE lams_presence_chat_msgs (
- uid bigint NOT NULL auto_increment,
- room_name VARCHAR(255),
- from_user VARCHAR(255),
- to_user VARCHAR(255),
- date_sent DATETIME,
- message VARCHAR(1023),
- PRIMARY KEY (uid)
-)TYPE=InnoDB;
-
--- LDEV-2005 Video Recorder configuration stuff --------------
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('Red5ServerUrl','', 'config.red5.server.url', 'config.header.red5', 'STRING', 0);
-
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0);
-
--- disable videorecorder
-update lams_learning_library set valid_flag=0 where title="VideoRecorder";
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LI-192 This script needs to be in updaters - before new tools are deployed
+--ALTER TABLE lams_tool ADD COLUMN pedagogical_planner_url TEXT;
+
+-- LDEV-1998 -------------
+ALTER TABLE lams_system_tool ADD COLUMN pedagogical_planner_url TEXT;
+UPDATE lams_system_tool SET pedagogical_planner_url='pedagogicalPlanner/initGrouping.do' WHERE system_tool_id=1;
+CREATE TABLE lams_planner_nodes (
+ uid BIGINT(20) NOT NULL auto_increment,
+ parent_uid BIGINT(20),
+ order_id TINYINT UNSIGNED NOT NULL,
+ locked TINYINT(1) NOT NULL DEFAULT 0,
+ content_folder_id VARCHAR(32),
+ title VARCHAR(255) NOT NULL,
+ brief_desc TEXT,
+ full_desc TEXT,
+ file_uuid BIGINT(20) UNSIGNED,
+ file_name VARCHAR(255),
+ PRIMARY KEY (uid),
+ UNIQUE KEY (parent_uid, order_id),
+ CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid)
+ REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+-- LDEV-2074 --------------
+ALTER TABLE lams_learning_design ADD COLUMN floating_activity_id BIGINT(20);
+CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC);
+INSERT INTO lams_learning_activity_type VALUES (15, 'FLOATING');
+
+-- LDEV-1983 --------------
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 0);
+
+-- LDEV-2099 --------------
+ALTER TABLE lams_user ADD COLUMN lams_community_token VARCHAR(255);
+ALTER TABLE lams_user ADD COLUMN lams_community_username VARCHAR(255);
+
+CREATE TABLE lams_registration (
+ uid BIGINT NOT NULL auto_increment
+ , site_name VARCHAR(255) NOT NULL
+ , organisation VARCHAR(255) NOT NULL
+ , name VARCHAR(255) NOT NULL
+ , email VARCHAR(255) NOT NULL
+ , server_country VARCHAR(2) NOT NULL
+ , public_directory TINYINT(1) DEFAULT 1
+ , enable_lams_community TINYINT(1) DEFAULT 0
+ , server_key VARCHAR(255) NOT NULL
+ , server_id VARCHAR(255) NOT NULL
+ , PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+-- LDEV-2107 --------------
+INSERT into lams_workspace_folder_type VALUES (3, 'PUBLIC SEQUENCES');
+
+-- LDEV-2115 --------------
+ALTER TABLE lams_progress_completed ADD COLUMN completed_date_time DATETIME;
+
+-- LDEV-2173 -------------- Adding in start dates for activities for gradebook
+ALTER TABLE lams_progress_attempted ADD COLUMN start_date_time DATETIME;
+ALTER TABLE lams_progress_completed ADD COLUMN start_date_time DATETIME;
+
+-- LDEV-2163 --------------
+CREATE TABLE lams_activity_evaluation (
+ activity_evaluation_id BIGINT(20) NOT NULL auto_increment
+ , activity_id BIGINT(20) NOT NULL
+ , tool_output_definition VARCHAR(255) NOT NULL
+ , INDEX (activity_id)
+ , CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id)
+ REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , PRIMARY KEY (activity_evaluation_id)
+)TYPE=InnoDB;
+
+-- LDEV-2174 -------------
+ALTER TABLE lams_tool DROP COLUMN classpath_addition;
+ALTER TABLE lams_tool DROP COLUMN context_file;
+
+-- LDEV-2205 ------------ Adding couse level settings for gradebook
+ALTER TABLE lams_organisation ADD COLUMN enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0;
+ALTER TABLE lams_organisation ADD COLUMN enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0;
+
+-- LDEV-2173 ------------ Gradebook stuff
+CREATE TABLE lams_gradebook_user_activity (
+ uid BIGINT(20) NOT NULL auto_increment
+ , activity_id BIGINT(20) NOT NULL
+ , user_id BIGINT (20) NOT NULL
+ , mark DOUBLE PRECISION
+ , marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0
+ , feedback TEXT
+ , INDEX (activity_id, user_id)
+ , CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id)
+ REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id)
+ REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+CREATE TABLE lams_gradebook_user_lesson (
+ uid BIGINT(20) NOT NULL auto_increment
+ , lesson_id BIGINT(20) NOT NULL
+ , user_id BIGINT (20) NOT NULL
+ , mark DOUBLE PRECISION
+ , feedback TEXT
+ , INDEX (lesson_id, user_id)
+ , CONSTRAINT FK_lams_gradebook_user_lesson_1 FOREIGN KEY (lesson_id)
+ REFERENCES lams_lesson (lesson_id)
+ , CONSTRAINT FK_lams_gradebook_user_lesson_2 FOREIGN KEY (user_id)
+ REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+-- LDEV-2207 ------------ Adding flag in lesson to release marks for gradebook
+ALTER TABLE lams_lesson ADD COLUMN marks_released TINYINT DEFAULT 0;
+
+-- LDEV-2165
+ALTER TABLE lams_events modify COLUMN name VARCHAR(128) NOT NULL;
+ALTER TABLE lams_events modify COLUMN scope VARCHAR(128) NOT NULL;
+
+-- LDEV-2125 -------------
+ALTER TABLE lams_user ADD COLUMN timezone TINYINT;
+
+-- LDEV-2054
+ALTER TABLE lams_grouping ADD COLUMN view_students_before_selection TINYINT DEFAULT 0;
+
+-- LDEV-2197 ------------ Presence Chat Logging
+CREATE TABLE lams_presence_chat_msgs (
+ uid bigint NOT NULL auto_increment,
+ room_name VARCHAR(255),
+ from_user VARCHAR(255),
+ to_user VARCHAR(255),
+ date_sent DATETIME,
+ message VARCHAR(1023),
+ PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+-- LDEV-2005 Video Recorder configuration stuff --------------
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('Red5ServerUrl','', 'config.red5.server.url', 'config.header.red5', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0);
+
+-- disable videorecorder
+update lams_learning_library set valid_flag=0 where title="VideoRecorder";
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql 6 Jul 2009 11:04:11 -0000 1.3
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql 7 Jul 2009 00:50:42 -0000 1.4
@@ -1,40 +1,40 @@
--- SQL statements to update from LAMS 2.3
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
--- Adding new column to external organisation table for tool adapters
-ALTER TABLE lams_ext_server_org_map ADD COLUMN server_url varchar(255) default null;
-
---
--- Table structure for table `lams_ext_server_tool_map`
---
-DROP TABLE IF EXISTS lams_ext_server_tool_map;
-CREATE TABLE lams_ext_server_tool_map (
- uid BIGINT(20) NOT NULL auto_increment,
- tool_id BIGINT(20) NOT NULL,
- ext_server_org_map_id int(11) NOT NULL,
- PRIMARY KEY (uid),
- UNIQUE KEY unique_adapter_map (ext_server_org_map_id, tool_id),
- CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE
-) TYPE=InnoDB;
-
--- LDEV-2369 Add tutorial video support
-ALTER TABLE lams_user ADD COLUMN tutorials_disabled TINYINT(1) DEFAULT 0,
- ADD COLUMN first_login TINYINT(1) DEFAULT 1;
-
-CREATE TABLE lams_user_disabled_tutorials (
- user_id BIGINT(20) NOT NULL,
- page_str CHAR(5) NOT NULL,
- CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
- PRIMARY KEY (user_id,page_str)
-)TYPE=InnoDB;
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.3
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- Adding new column to external organisation table for tool adapters
+ALTER TABLE lams_ext_server_org_map ADD COLUMN server_url varchar(255) default null;
+
+--
+-- Table structure for table `lams_ext_server_tool_map`
+--
+DROP TABLE IF EXISTS lams_ext_server_tool_map;
+CREATE TABLE lams_ext_server_tool_map (
+ uid BIGINT(20) NOT NULL auto_increment,
+ tool_id BIGINT(20) NOT NULL,
+ ext_server_org_map_id int(11) NOT NULL,
+ PRIMARY KEY (uid),
+ UNIQUE KEY unique_adapter_map (ext_server_org_map_id, tool_id),
+ CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE
+) TYPE=InnoDB;
+
+-- LDEV-2369 Add tutorial video support
+ALTER TABLE lams_user ADD COLUMN tutorials_disabled TINYINT(1) DEFAULT 0,
+ ADD COLUMN first_login TINYINT(1) DEFAULT 1;
+
+CREATE TABLE lams_user_disabled_tutorials (
+ user_id BIGINT(20) NOT NULL,
+ page_str CHAR(5) NOT NULL,
+ CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+ PRIMARY KEY (user_id,page_str)
+)TYPE=InnoDB;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch0017_updateFrom23.sql,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql 27 Apr 2009 19:36:57 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql 7 Jul 2009 00:50:42 -0000 1.2
@@ -1,15 +1,15 @@
--- SQL statements to update from LAMS 2.3
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
--- LDEV-2125 -------------
-ALTER TABLE lams_user ADD COLUMN timezone TINYINT;
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.3
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-2125 -------------
+ALTER TABLE lams_user ADD COLUMN timezone TINYINT;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql 1 Jul 2009 02:39:10 -0000 1.2
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql 7 Jul 2009 00:49:35 -0000 1.3
@@ -1,3 +1,3 @@
-
--- LDEV-2638 Adding completion time for each question
+
+-- LDEV-2638 Adding completion time for each question
alter table tl_laasse10_question_result add column finish_date datetime default null;
\ No newline at end of file
Index: lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/updatescripts/Attic/updateTo20070315.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql 22 Mar 2007 05:12:24 -0000 1.1
+++ lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql 7 Jul 2009 00:48:00 -0000 1.2
@@ -1,4 +1,4 @@
--- Update the Notebook tables to 20070315
--- This is for the LAMS 2.0.2 release.
-
-UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11';
+-- Update the Notebook tables to 20070315
+-- This is for the LAMS 2.0.2 release.
+
+UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11';
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql 6 Nov 2008 23:52:44 -0000 1.2
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql 7 Jul 2009 00:48:49 -0000 1.3
@@ -1,24 +1,24 @@
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
--- SQL statements to update from LAMS 2.1/2.1.1
-CREATE TABLE tl_lachat11_conditions (
- condition_id BIGINT(20) NOT NULL
- , content_uid BIGINT(20)
- , PRIMARY KEY (condition_id)
- , CONSTRAINT ChatConditionInheritance FOREIGN KEY (condition_id)
- REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT ChatConditionToChat FOREIGN KEY (content_uid)
- REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lachat11';
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- SQL statements to update from LAMS 2.1/2.1.1
+CREATE TABLE tl_lachat11_conditions (
+ condition_id BIGINT(20) NOT NULL
+ , content_uid BIGINT(20)
+ , PRIMARY KEY (condition_id)
+ , CONSTRAINT ChatConditionInheritance FOREIGN KEY (condition_id)
+ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT ChatConditionToChat FOREIGN KEY (content_uid)
+ REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lachat11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql 9 Dec 2008 05:40:31 -0000 1.1
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql 7 Jul 2009 00:48:49 -0000 1.2
@@ -1,14 +1,14 @@
--- SQL statements to update from LAMS 2.2
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-UPDATE lams_tool SET pedagogical_planner_url='tool/lachat11/pedagogicalPlanner.do' WHERE tool_signature='lachat11';
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+UPDATE lams_tool SET pedagogical_planner_url='tool/lachat11/pedagogicalPlanner.do' WHERE tool_signature='lachat11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_daco/db/clear_old_learning_session.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/Attic/clear_old_learning_session.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/db/clear_old_learning_session.sql 4 Jul 2008 07:14:25 -0000 1.2
+++ lams_tool_daco/db/clear_old_learning_session.sql 7 Jul 2009 00:47:19 -0000 1.3
@@ -1,5 +1,5 @@
-delete from lams_progress_attempted;
-delete from lams_progress_completed;
-delete from lams_learner_progress;
-delete from lams_tool_session;
+delete from lams_progress_attempted;
+delete from lams_progress_completed;
+delete from lams_learner_progress;
+delete from lams_tool_session;
delete from lams_learning_transition;
\ No newline at end of file
Index: lams_tool_daco/db/model/daco.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/model/daco.clay,v
diff -u -r1.5 -r1.6
--- lams_tool_daco/db/model/daco.clay 26 Aug 2008 03:28:09 -0000 1.5
+++ lams_tool_daco/db/model/daco.clay 7 Jul 2009 00:45:57 -0000 1.6
@@ -1,896 +1,896 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_daco/db/sql/activity_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/activity_insert.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/db/sql/activity_insert.sql 19 Aug 2008 03:52:31 -0000 1.3
+++ lams_tool_daco/db/sql/activity_insert.sql 7 Jul 2009 00:46:07 -0000 1.4
@@ -1,82 +1,82 @@
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2005-04-07 11:08:32
-#
-INSERT INTO lams_learning_activity
-(
-activity_ui_id
-, description
-, title
-, help_text
-, xcoord
-, ycoord
-, parent_activity_id
-, parent_ui_id
-, learning_activity_type_id
-, grouping_support_type_id
-, apply_grouping_flag
-, grouping_id
-, grouping_ui_id
-, order_id
-, define_later_flag
-, learning_design_id
-, learning_library_id
-, create_date_time
-, run_offline_flag
-, max_number_of_options
-, min_number_of_options
-, options_instructions
-, tool_id
-, tool_content_id
-, activity_category_id
-, gate_activity_level_id
-, gate_open_flag
-, gate_start_time_offset
-, gate_end_time_offset
-, gate_start_date_time
-, gate_end_date_time
-, library_activity_ui_image
-, create_grouping_id
-, create_grouping_ui_id
-, library_activity_id
-, language_file
-)
-VALUES
-(
-NULL
-, 'Collecting data with custom structure.'
-, 'Data Collection'
-, 'Asking questions with custom, limited answers.'
-, NULL
-, NULL
-, NULL
-, NULL
-, 1
-, 2
-, 0
-, NULL
-, NULL
-, NULL
-, 0
-, NULL
-, ${learning_library_id}
-, NOW()
-, 0
-, NULL
-, NULL
-, NULL
-, ${tool_id}
-, NULL
-, 6
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, 'tool/ladaco10/images/icon_daco.swf'
-, NULL
-, NULL
-, NULL
-, 'org.lamsfoundation.lams.tool.daco.ApplicationResources'
-)
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 11:08:32
+#
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+, language_file
+)
+VALUES
+(
+NULL
+, 'Collecting data with custom structure.'
+, 'Data Collection'
+, 'Asking questions with custom, limited answers.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 2
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, ${learning_library_id}
+, NOW()
+, 0
+, NULL
+, NULL
+, NULL
+, ${tool_id}
+, NULL
+, 6
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, 'tool/ladaco10/images/icon_daco.swf'
+, NULL
+, NULL
+, NULL
+, 'org.lamsfoundation.lams.tool.daco.ApplicationResources'
+)
Index: lams_tool_daco/db/sql/create_lams_tool_daco.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/create_lams_tool_daco.sql,v
diff -u -r1.8 -r1.9
--- lams_tool_daco/db/sql/create_lams_tool_daco.sql 27 Mar 2009 18:23:39 -0000 1.8
+++ lams_tool_daco/db/sql/create_lams_tool_daco.sql 7 Jul 2009 00:46:07 -0000 1.9
@@ -1,124 +1,124 @@
-SET FOREIGN_KEY_CHECKS=0;
-
-DROP TABLE if exists tl_ladaco10_attachments cascade;
-DROP TABLE if exists tl_ladaco10_contents cascade;
-DROP TABLE if exists tl_ladaco10_questions cascade;
-DROP TABLE if exists tl_ladaco10_answer_options cascade;
-DROP TABLE if exists tl_ladaco10_sessions cascade;
-DROP TABLE if exists tl_ladaco10_users cascade;
-DROP TABLE if exists tl_ladaco10_answers cascade;
-
-CREATE TABLE tl_ladaco10_contents (
- uid bigint NOT NULL UNIQUE auto_increment,
- create_date datetime,
- update_date datetime,
- create_by bigint,
- title varchar(255),
- run_offline tinyint DEFAULT 0,
- lock_on_finished tinyint DEFAULT 0,
- min_records tinyint unsigned DEFAULT 0,
- max_records tinyint unsigned DEFAULT 0,
- instructions text,
- online_instructions text,
- offline_instructions text,
- content_in_use tinyint DEFAULT 0,
- define_later tinyint DEFAULT 0,
- content_id bigint UNIQUE,
- reflect_instructions varchar(255),
- reflect_on_activity tinyint,
- learner_entry_notify tinyint DEFAULT 0,
- record_submit_notify tinyint DEFAULT 0,
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_sessions (
- uid bigint NOT NULL UNIQUE auto_increment,
- session_end_date datetime,
- session_start_date datetime,
- status integer,
- content_uid bigint,
- session_id bigint UNIQUE,
- session_name varchar(250),
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_attachments (
- uid bigint NOT NULL UNIQUE auto_increment,
- file_version_id bigint,
- file_type varchar(255),
- file_name varchar(255),
- file_uuid bigint,
- create_date datetime ,
- content_uid bigint,
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_questions (
- uid bigint NOT NULL UNIQUE auto_increment,
- description text,
- create_by bigint,
- create_date datetime ,
- is_required tinyint DEFAULT 0,
- question_type tinyint unsigned,
- min_constraint float,
- max_constraint float,
- digits_decimal tinyint unsigned,
- summary tinyint unsigned,
- content_uid bigint,
- session_uid bigint,
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_answer_options
-(uid bigint NOT NULL UNIQUE auto_increment,
-question_uid bigint,
-sequence_num tinyint unsigned DEFAULT 1,
-answer_option varchar(255),
-PRIMARY KEY (uid))
-TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_users (
- uid bigint NOT NULL auto_increment,
- user_id bigint,
- last_name varchar(255),
- first_name varchar(255),
- login_name varchar(255),
- session_finished smallint,
- session_uid bigint,
- content_uid bigint,
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-CREATE TABLE tl_ladaco10_answers (
- uid bigint NOT NULL UNIQUE auto_increment,
- user_uid bigint,
- question_uid bigint,
- record_id smallint unsigned,
- answer text,
- file_type varchar(255),
- file_name varchar(255),
- file_uuid bigint,
- file_version_id bigint,
- create_date datetime,
- PRIMARY KEY (uid)
-)TYPE=innodb;
-
-ALTER TABLE tl_ladaco10_attachments ADD INDEX (content_uid), ADD CONSTRAINT FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
-ALTER TABLE tl_ladaco10_contents ADD INDEX (create_by), ADD CONSTRAINT DacoToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid);
-ALTER TABLE tl_ladaco10_questions ADD INDEX (create_by), ADD CONSTRAINT QuestionToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid);
-ALTER TABLE tl_ladaco10_questions ADD INDEX (content_uid), ADD CONSTRAINT QuestionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
-ALTER TABLE tl_ladaco10_questions ADD INDEX (session_uid), ADD CONSTRAINT FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid);
-ALTER TABLE tl_ladaco10_answer_options ADD INDEX (question_uid), ADD CONSTRAINT FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid);
-ALTER TABLE tl_ladaco10_sessions ADD INDEX (content_uid), ADD CONSTRAINT SessionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
-ALTER TABLE tl_ladaco10_users ADD INDEX (session_uid), ADD CONSTRAINT UserToSession FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid);
-ALTER TABLE tl_ladaco10_users ADD INDEX (content_uid), ADD CONSTRAINT UserToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
-ALTER TABLE tl_ladaco10_answers ADD INDEX (user_uid), ADD CONSTRAINT AnswerToUser FOREIGN KEY (user_uid) REFERENCES tl_ladaco10_users (uid);
-ALTER TABLE tl_ladaco10_answers ADD INDEX (question_uid), ADD CONSTRAINT AnswerToQuestion FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid);
-
-INSERT INTO `tl_ladaco10_contents` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,`min_records`,`max_records`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`,`reflect_on_activity`) VALUES
- (1,NULL,NULL,NULL,'Data Collection',0,0,0,0,'Instructions',NULL,NULL,0,0,${default_content_id},0);
-
-INSERT INTO `tl_ladaco10_questions` (`uid`, `description`, `create_by`, `create_date`, `is_required`, `question_type`, `min_constraint`, `max_constraint`,`digits_decimal`,`summary`, `content_uid`, `session_uid`) VALUES
- (DEFAULT,'What is your favourite colour?
',NULL,NOW(),0,1,NULL,NULL,NULL,NULL,1,NULL);
-
+SET FOREIGN_KEY_CHECKS=0;
+
+DROP TABLE if exists tl_ladaco10_attachments cascade;
+DROP TABLE if exists tl_ladaco10_contents cascade;
+DROP TABLE if exists tl_ladaco10_questions cascade;
+DROP TABLE if exists tl_ladaco10_answer_options cascade;
+DROP TABLE if exists tl_ladaco10_sessions cascade;
+DROP TABLE if exists tl_ladaco10_users cascade;
+DROP TABLE if exists tl_ladaco10_answers cascade;
+
+CREATE TABLE tl_ladaco10_contents (
+ uid bigint NOT NULL UNIQUE auto_increment,
+ create_date datetime,
+ update_date datetime,
+ create_by bigint,
+ title varchar(255),
+ run_offline tinyint DEFAULT 0,
+ lock_on_finished tinyint DEFAULT 0,
+ min_records tinyint unsigned DEFAULT 0,
+ max_records tinyint unsigned DEFAULT 0,
+ instructions text,
+ online_instructions text,
+ offline_instructions text,
+ content_in_use tinyint DEFAULT 0,
+ define_later tinyint DEFAULT 0,
+ content_id bigint UNIQUE,
+ reflect_instructions varchar(255),
+ reflect_on_activity tinyint,
+ learner_entry_notify tinyint DEFAULT 0,
+ record_submit_notify tinyint DEFAULT 0,
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_sessions (
+ uid bigint NOT NULL UNIQUE auto_increment,
+ session_end_date datetime,
+ session_start_date datetime,
+ status integer,
+ content_uid bigint,
+ session_id bigint UNIQUE,
+ session_name varchar(250),
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_attachments (
+ uid bigint NOT NULL UNIQUE auto_increment,
+ file_version_id bigint,
+ file_type varchar(255),
+ file_name varchar(255),
+ file_uuid bigint,
+ create_date datetime ,
+ content_uid bigint,
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_questions (
+ uid bigint NOT NULL UNIQUE auto_increment,
+ description text,
+ create_by bigint,
+ create_date datetime ,
+ is_required tinyint DEFAULT 0,
+ question_type tinyint unsigned,
+ min_constraint float,
+ max_constraint float,
+ digits_decimal tinyint unsigned,
+ summary tinyint unsigned,
+ content_uid bigint,
+ session_uid bigint,
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_answer_options
+(uid bigint NOT NULL UNIQUE auto_increment,
+question_uid bigint,
+sequence_num tinyint unsigned DEFAULT 1,
+answer_option varchar(255),
+PRIMARY KEY (uid))
+TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_users (
+ uid bigint NOT NULL auto_increment,
+ user_id bigint,
+ last_name varchar(255),
+ first_name varchar(255),
+ login_name varchar(255),
+ session_finished smallint,
+ session_uid bigint,
+ content_uid bigint,
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+CREATE TABLE tl_ladaco10_answers (
+ uid bigint NOT NULL UNIQUE auto_increment,
+ user_uid bigint,
+ question_uid bigint,
+ record_id smallint unsigned,
+ answer text,
+ file_type varchar(255),
+ file_name varchar(255),
+ file_uuid bigint,
+ file_version_id bigint,
+ create_date datetime,
+ PRIMARY KEY (uid)
+)TYPE=innodb;
+
+ALTER TABLE tl_ladaco10_attachments ADD INDEX (content_uid), ADD CONSTRAINT FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
+ALTER TABLE tl_ladaco10_contents ADD INDEX (create_by), ADD CONSTRAINT DacoToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid);
+ALTER TABLE tl_ladaco10_questions ADD INDEX (create_by), ADD CONSTRAINT QuestionToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid);
+ALTER TABLE tl_ladaco10_questions ADD INDEX (content_uid), ADD CONSTRAINT QuestionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
+ALTER TABLE tl_ladaco10_questions ADD INDEX (session_uid), ADD CONSTRAINT FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid);
+ALTER TABLE tl_ladaco10_answer_options ADD INDEX (question_uid), ADD CONSTRAINT FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid);
+ALTER TABLE tl_ladaco10_sessions ADD INDEX (content_uid), ADD CONSTRAINT SessionToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
+ALTER TABLE tl_ladaco10_users ADD INDEX (session_uid), ADD CONSTRAINT UserToSession FOREIGN KEY (session_uid) REFERENCES tl_ladaco10_sessions (uid);
+ALTER TABLE tl_ladaco10_users ADD INDEX (content_uid), ADD CONSTRAINT UserToDaco FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid);
+ALTER TABLE tl_ladaco10_answers ADD INDEX (user_uid), ADD CONSTRAINT AnswerToUser FOREIGN KEY (user_uid) REFERENCES tl_ladaco10_users (uid);
+ALTER TABLE tl_ladaco10_answers ADD INDEX (question_uid), ADD CONSTRAINT AnswerToQuestion FOREIGN KEY (question_uid) REFERENCES tl_ladaco10_questions (uid);
+
+INSERT INTO `tl_ladaco10_contents` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,`min_records`,`max_records`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`,`reflect_on_activity`) VALUES
+ (1,NULL,NULL,NULL,'Data Collection',0,0,0,0,'Instructions',NULL,NULL,0,0,${default_content_id},0);
+
+INSERT INTO `tl_ladaco10_questions` (`uid`, `description`, `create_by`, `create_date`, `is_required`, `question_type`, `min_constraint`, `max_constraint`,`digits_decimal`,`summary`, `content_uid`, `session_uid`) VALUES
+ (DEFAULT,'What is your favourite colour?
',NULL,NOW(),0,1,NULL,NULL,NULL,NULL,1,NULL);
+
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_daco/db/sql/drop_lams_tool_daco.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/drop_lams_tool_daco.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/db/sql/drop_lams_tool_daco.sql 8 Aug 2008 08:10:22 -0000 1.3
+++ lams_tool_daco/db/sql/drop_lams_tool_daco.sql 7 Jul 2009 00:46:07 -0000 1.4
@@ -1,9 +1,9 @@
-SET FOREIGN_KEY_CHECKS=0;
-drop table if exists tl_ladaco10_attachments;
-drop table if exists tl_ladaco10_contents;
-drop table if exists tl_ladaco10_questions;
-drop table if exists tl_ladaco10_answer_options;
-drop table if exists tl_ladaco10_sessions;
-drop table if exists tl_ladaco10_users;
-drop table if exists tl_ladaco10_answers;
+SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_ladaco10_attachments;
+drop table if exists tl_ladaco10_contents;
+drop table if exists tl_ladaco10_questions;
+drop table if exists tl_ladaco10_answer_options;
+drop table if exists tl_ladaco10_sessions;
+drop table if exists tl_ladaco10_users;
+drop table if exists tl_ladaco10_answers;
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_daco/db/sql/library_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/library_insert.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/db/sql/library_insert.sql 8 Aug 2008 08:10:22 -0000 1.2
+++ lams_tool_daco/db/sql/library_insert.sql 7 Jul 2009 00:46:07 -0000 1.3
@@ -1,18 +1,18 @@
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2005-04-07 10:50:55
-#
-INSERT INTO lams_learning_library
-(
-description,
-title,
-valid_flag,
-create_date_time
-)
-VALUES
-(
-'Collecting data with custom structure.',
-'Data Collection',
-0,
-NOW()
-)
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:50:55
+#
+INSERT INTO lams_learning_library
+(
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+'Collecting data with custom structure.',
+'Data Collection',
+0,
+NOW()
+)
Index: lams_tool_daco/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/tool_insert.sql,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/db/sql/tool_insert.sql 26 Mar 2009 10:00:37 -0000 1.4
+++ lams_tool_daco/db/sql/tool_insert.sql 7 Jul 2009 00:46:07 -0000 1.5
@@ -1,62 +1,62 @@
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2005-04-07 10:42:43
-#
-INSERT INTO lams_tool
-(
-tool_signature,
-service_name,
-tool_display_name,
-description,
-tool_identifier,
-tool_version,
-learning_library_id,
-default_tool_content_id,
-valid_flag,
-grouping_support_type_id,
-supports_run_offline_flag,
-learner_url,
-learner_preview_url,
-learner_progress_url,
-author_url,
-monitor_url,
-define_later_url,
-export_pfolio_learner_url,
-export_pfolio_class_url,
-contribute_url,
-moderation_url,
-help_url,
-language_file,
-create_date_time,
-modified_date_time,
-supports_outputs
-)
-VALUES
-(
-'ladaco10',
-'dacoService',
-'Data Collection',
-'Collecting data with custom structure.',
-'daco',
-'@tool_version@',
-NULL,
-NULL,
-0,
-2,
-1,
-'tool/ladaco10/learning/start.do?mode=learner',
-'tool/ladaco10/learning/start.do?mode=author',
-'tool/ladaco10/learning/start.do?mode=teacher',
-'tool/ladaco10/authoring/start.do',
-'tool/ladaco10/monitoring/summary.do',
-'tool/ladaco10/definelater.do',
-'tool/ladaco10/exportPortfolio?mode=learner',
-'tool/ladaco10/exportPortfolio?mode=teacher',
-'tool/ladaco10/contribute.do',
-'tool/ladaco10/moderate.do',
-'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10',
-'org.lamsfoundation.lams.tool.daco.ApplicationResources',
-NOW(),
-NOW(),
-1
-)
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:42:43
+#
+INSERT INTO lams_tool
+(
+tool_signature,
+service_name,
+tool_display_name,
+description,
+tool_identifier,
+tool_version,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_run_offline_flag,
+learner_url,
+learner_preview_url,
+learner_progress_url,
+author_url,
+monitor_url,
+define_later_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
+contribute_url,
+moderation_url,
+help_url,
+language_file,
+create_date_time,
+modified_date_time,
+supports_outputs
+)
+VALUES
+(
+'ladaco10',
+'dacoService',
+'Data Collection',
+'Collecting data with custom structure.',
+'daco',
+'@tool_version@',
+NULL,
+NULL,
+0,
+2,
+1,
+'tool/ladaco10/learning/start.do?mode=learner',
+'tool/ladaco10/learning/start.do?mode=author',
+'tool/ladaco10/learning/start.do?mode=teacher',
+'tool/ladaco10/authoring/start.do',
+'tool/ladaco10/monitoring/summary.do',
+'tool/ladaco10/definelater.do',
+'tool/ladaco10/exportPortfolio?mode=learner',
+'tool/ladaco10/exportPortfolio?mode=teacher',
+'tool/ladaco10/contribute.do',
+'tool/ladaco10/moderate.do',
+'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10',
+'org.lamsfoundation.lams.tool.daco.ApplicationResources',
+NOW(),
+NOW(),
+1
+)
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql 14 Nov 2008 04:05:26 -0000 1.1
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql 7 Jul 2009 00:47:30 -0000 1.2
@@ -1,17 +1,17 @@
--- SQL statements to update from LAMS 2.1/2.1.1
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-
--- SQL statements to update from LAMS 2.1/2.1.1
-
-UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='ladaco10';
-
----Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
-SET AUTOCOMMIT = 1;
+-- SQL statements to update from LAMS 2.1/2.1.1
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+
+-- SQL statements to update from LAMS 2.1/2.1.1
+
+UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='ladaco10';
+
+---Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql 27 Mar 2009 18:23:39 -0000 1.1
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql 7 Jul 2009 00:47:30 -0000 1.2
@@ -1,14 +1,14 @@
--- SQL statements to update from LAMS 2.2
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-ALTER TABLE tl_ladaco10_answers ADD COLUMN create_date datetime;
-
----Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+ALTER TABLE tl_ladaco10_answers ADD COLUMN create_date datetime;
+
+---Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_deploy/test/file/sql/drop_tool_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/test/file/sql/Attic/drop_tool_tables.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_deploy/test/file/sql/drop_tool_tables.sql 1 Dec 2005 23:48:41 -0000 1.1
+++ lams_tool_deploy/test/file/sql/drop_tool_tables.sql 7 Jul 2009 00:45:36 -0000 1.2
@@ -1,3 +1,3 @@
-DROP TABLE IF EXISTS tool_imscp_content;
-DROP TABLE IF EXISTS tool_imscp_userprogress;
+DROP TABLE IF EXISTS tool_imscp_content;
+DROP TABLE IF EXISTS tool_imscp_userprogress;
DROP TABLE IF EXISTS tool_imscp_package;
\ No newline at end of file
Index: lams_tool_deploy/test/file/sql/insert_library_test_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/test/file/sql/Attic/insert_library_test_data.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_deploy/test/file/sql/insert_library_test_data.sql 1 Dec 2005 23:48:41 -0000 1.1
+++ lams_tool_deploy/test/file/sql/insert_library_test_data.sql 7 Jul 2009 00:45:36 -0000 1.2
@@ -1,455 +1,455 @@
-# Inserts the tools nb, qa, sbmt.
-# Used to test the library deploy,
-# tools must exist before library deploy is to be executed
-
-
-######## NB Tool ##############
-
-
-INSERT INTO lams_tool
-(
-tool_id,
-tool_signature,
-service_name,
-tool_display_name,
-description,
-tool_identifier,
-tool_version,
-learning_library_id,
-default_tool_content_id,
-valid_flag,
-grouping_support_type_id,
-supports_define_later_flag,
-supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
-learner_url,
-author_url,
-define_later_url,
-export_portfolio_url,
-monitor_url,
-contribute_url,
-moderation_url,
-create_date_time
-)
-VALUES
-(
-1,
-'lanb11',
-'nbService',
-'Noticeboard',
-'Displays a Noticeboard',
-'nb',
-'1.1',
-NULL,
-NULL,
-0,
-1,
-1,
-1,
-0,
-0,
-'tool/lanb11/starter/learner.do',
-'tool/lanb11/authoring.do',
-'tool/lanb11/starter/authoring.do?defineLater=true',
-'tool/lanb11/exportPortfolio.do',
-'tool/lanb11/starter/monitor.do',
-NULL,
-NULL,
-NOW()
-);
-
-INSERT INTO lams_learning_library
-(
-learning_library_id,
-description,
-title,
-valid_flag,
-create_date_time
-)
-VALUES
-(
-1,
-'Displays a Noticeboard',
-'Noticeboard',
-0,
-NOW()
-);
-
-INSERT INTO lams_learning_activity
-(
-activity_ui_id
-, description
-, title
-, help_text
-, xcoord
-, ycoord
-, parent_activity_id
-, parent_ui_id
-, learning_activity_type_id
-, grouping_support_type_id
-, apply_grouping_flag
-, grouping_id
-, grouping_ui_id
-, order_id
-, define_later_flag
-, learning_design_id
-, learning_library_id
-, create_date_time
-, run_offline_flag
-, max_number_of_options
-, min_number_of_options
-, options_instructions
-, tool_id
-, tool_content_id
-, activity_category_id
-, gate_activity_level_id
-, gate_open_flag
-, gate_start_time_offset
-, gate_end_time_offset
-, gate_start_date_time
-, gate_end_date_time
-, library_activity_ui_image
-, create_grouping_id
-, create_grouping_ui_id
-, library_activity_id
-)
-VALUES
-(
-NULL
-, 'Displays a Noticeboard'
-, 'Noticeboard'
-, 'Put some help text here.'
-, NULL
-, NULL
-, NULL
-, NULL
-, 1
-, 1
-, 0
-, NULL
-, NULL
-, NULL
-, 0
-, NULL
-, 1
-, NOW()
-, 0
-, NULL
-, NULL
-, NULL
-, 1
-, NULL
-, 4
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, 'tool/lanb11/images/icon_noticeboard.swf'
-, NULL
-, NULL
-, NULL
-);
-
-######## Submit Tool ##############
-
-INSERT INTO lams_tool
-(
-tool_id,
-tool_signature,
-service_name,
-tool_display_name,
-description,
-tool_identifier,
-tool_version,
-learning_library_id,
-default_tool_content_id,
-valid_flag,
-grouping_support_type_id,
-supports_define_later_flag,
-supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
-learner_url,
-author_url,
-define_later_url,
-export_portfolio_url,
-monitor_url,
-contribute_url,
-moderation_url,
-create_date_time
-)
-VALUES
-(
-2,
-'lasbmt11',
-'submitFilesService',
-'Submit File',
-'Submit File Tool Description',
-'submitfile',
-'1.1',
-NULL,
-NULL,
-0,
-1,
-1,
-1,
-1,
-0,
-'tool/lasbmt11/learner.do',
-'tool/lasbmt11/authoring.do',
-'tool/lasbmt11/definelater.do',
-'tool/lasbmt11/export.do',
-'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/monitoring.do',
-NOW()
-);
-
-INSERT INTO lams_learning_library
-(
-learning_library_id,
-description,
-title,
-valid_flag,
-create_date_time
-)
-VALUES
-(
-2,
-'Uploading of files by learners, for review by teachers.',
-'Submit file',
-0,
-NOW()
-);
-
-INSERT INTO lams_learning_activity
-(
-activity_ui_id
-, description
-, title
-, help_text
-, xcoord
-, ycoord
-, parent_activity_id
-, parent_ui_id
-, learning_activity_type_id
-, grouping_support_type_id
-, apply_grouping_flag
-, grouping_id
-, grouping_ui_id
-, order_id
-, define_later_flag
-, learning_design_id
-, learning_library_id
-, create_date_time
-, run_offline_flag
-, max_number_of_options
-, min_number_of_options
-, options_instructions
-, tool_id
-, tool_content_id
-, activity_category_id
-, gate_activity_level_id
-, gate_open_flag
-, gate_start_time_offset
-, gate_end_time_offset
-, gate_start_date_time
-, gate_end_date_time
-, library_activity_ui_image
-, create_grouping_id
-, create_grouping_ui_id
-, library_activity_id
-)
-VALUES
-(
-NULL
-, 'Uploading of files by learners, for review by teachers.'
-, 'Submit File'
-, 'Put some help text here.'
-, NULL
-, NULL
-, NULL
-, NULL
-, 1
-, 1
-, 0
-, NULL
-, NULL
-, NULL
-, 0
-, NULL
-, 2
-, NOW()
-, 0
-, NULL
-, NULL
-, NULL
-, 2
-, NULL
-, 4
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, 'tool/lasbmt11/images/icon_reportsubmission.swf'
-, NULL
-, NULL
-, NULL
-);
-
-##### QA tool #####
-
-INSERT INTO lams_tool
-(
-tool_id,
-tool_signature,
-service_name,
-tool_display_name,
-description,
-tool_identifier,
-tool_version,
-learning_library_id,
-default_tool_content_id,
-valid_flag,
-grouping_support_type_id,
-supports_define_later_flag,
-supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
-learner_url,
-author_url,
-define_later_url,
-export_portfolio_url,
-monitor_url,
-contribute_url,
-moderation_url,
-create_date_time
-)
-VALUES
-(
-3,
-'laqa11',
-'qaService',
-'Question and Answer',
-'Question and Answer Tool Description',
-'qa',
-'1.1',
-NULL,
-10,
-0,
-1,
-1,
-1,
-1,
-0,
-'tool/laqa11/learningStarter.do',
-'tool/laqa11/authoringStarter.do',
-'tool/laqa11/definelater.do',
-'tool/laqa11/export.do',
-'tool/laqa11/monitoringStarter.do',
-'tool/laqa11/monitoringStarter.do',
-'tool/laqa11/monitoringStarter.do',
-NOW()
-);
-
-INSERT INTO lams_learning_library
-(
-learning_library_id,
-description,
-title,
-valid_flag,
-create_date_time
-)
-VALUES
-(
-3,
-'Question and Answer Learning Library Description',
-'Question and Answer',
-0,
-NOW()
-);
-
-INSERT INTO lams_learning_activity
-(
-activity_ui_id
-, description
-, title
-, help_text
-, xcoord
-, ycoord
-, parent_activity_id
-, parent_ui_id
-, learning_activity_type_id
-, grouping_support_type_id
-, apply_grouping_flag
-, grouping_id
-, grouping_ui_id
-, order_id
-, define_later_flag
-, learning_design_id
-, learning_library_id
-, create_date_time
-, run_offline_flag
-, max_number_of_options
-, min_number_of_options
-, options_instructions
-, tool_id
-, tool_content_id
-, activity_category_id
-, gate_activity_level_id
-, gate_open_flag
-, gate_start_time_offset
-, gate_end_time_offset
-, gate_start_date_time
-, gate_end_date_time
-, library_activity_ui_image
-, create_grouping_id
-, create_grouping_ui_id
-, library_activity_id
-)
-VALUES
-(
-NULL
-, 'Question and Answer Description'
-, 'Question and Answer'
-, 'Put some help text here.'
-, NULL
-, NULL
-, NULL
-, NULL
-, 1
-, 1
-, 0
-, NULL
-, NULL
-, NULL
-, 0
-, NULL
-, 3
-, NOW()
-, 0
-, NULL
-, NULL
-, NULL
-, 3
-, NULL
-, 4
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, 'tool/laqa11/images/icon_questionanswer.swf'
-, NULL
-, NULL
-, NULL
-);
-
-
-
+# Inserts the tools nb, qa, sbmt.
+# Used to test the library deploy,
+# tools must exist before library deploy is to be executed
+
+
+######## NB Tool ##############
+
+
+INSERT INTO lams_tool
+(
+tool_id,
+tool_signature,
+service_name,
+tool_display_name,
+description,
+tool_identifier,
+tool_version,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_define_later_flag,
+supports_run_offline_flag,
+supports_moderation_flag,
+supports_contribute_flag,
+learner_url,
+author_url,
+define_later_url,
+export_portfolio_url,
+monitor_url,
+contribute_url,
+moderation_url,
+create_date_time
+)
+VALUES
+(
+1,
+'lanb11',
+'nbService',
+'Noticeboard',
+'Displays a Noticeboard',
+'nb',
+'1.1',
+NULL,
+NULL,
+0,
+1,
+1,
+1,
+0,
+0,
+'tool/lanb11/starter/learner.do',
+'tool/lanb11/authoring.do',
+'tool/lanb11/starter/authoring.do?defineLater=true',
+'tool/lanb11/exportPortfolio.do',
+'tool/lanb11/starter/monitor.do',
+NULL,
+NULL,
+NOW()
+);
+
+INSERT INTO lams_learning_library
+(
+learning_library_id,
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+1,
+'Displays a Noticeboard',
+'Noticeboard',
+0,
+NOW()
+);
+
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+)
+VALUES
+(
+NULL
+, 'Displays a Noticeboard'
+, 'Noticeboard'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 1
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, 1
+, NOW()
+, 0
+, NULL
+, NULL
+, NULL
+, 1
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, 'tool/lanb11/images/icon_noticeboard.swf'
+, NULL
+, NULL
+, NULL
+);
+
+######## Submit Tool ##############
+
+INSERT INTO lams_tool
+(
+tool_id,
+tool_signature,
+service_name,
+tool_display_name,
+description,
+tool_identifier,
+tool_version,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_define_later_flag,
+supports_run_offline_flag,
+supports_moderation_flag,
+supports_contribute_flag,
+learner_url,
+author_url,
+define_later_url,
+export_portfolio_url,
+monitor_url,
+contribute_url,
+moderation_url,
+create_date_time
+)
+VALUES
+(
+2,
+'lasbmt11',
+'submitFilesService',
+'Submit File',
+'Submit File Tool Description',
+'submitfile',
+'1.1',
+NULL,
+NULL,
+0,
+1,
+1,
+1,
+1,
+0,
+'tool/lasbmt11/learner.do',
+'tool/lasbmt11/authoring.do',
+'tool/lasbmt11/definelater.do',
+'tool/lasbmt11/export.do',
+'tool/lasbmt11/monitoring.do',
+'tool/lasbmt11/monitoring.do',
+'tool/lasbmt11/monitoring.do',
+NOW()
+);
+
+INSERT INTO lams_learning_library
+(
+learning_library_id,
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+2,
+'Uploading of files by learners, for review by teachers.',
+'Submit file',
+0,
+NOW()
+);
+
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+)
+VALUES
+(
+NULL
+, 'Uploading of files by learners, for review by teachers.'
+, 'Submit File'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 1
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, 2
+, NOW()
+, 0
+, NULL
+, NULL
+, NULL
+, 2
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, 'tool/lasbmt11/images/icon_reportsubmission.swf'
+, NULL
+, NULL
+, NULL
+);
+
+##### QA tool #####
+
+INSERT INTO lams_tool
+(
+tool_id,
+tool_signature,
+service_name,
+tool_display_name,
+description,
+tool_identifier,
+tool_version,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_define_later_flag,
+supports_run_offline_flag,
+supports_moderation_flag,
+supports_contribute_flag,
+learner_url,
+author_url,
+define_later_url,
+export_portfolio_url,
+monitor_url,
+contribute_url,
+moderation_url,
+create_date_time
+)
+VALUES
+(
+3,
+'laqa11',
+'qaService',
+'Question and Answer',
+'Question and Answer Tool Description',
+'qa',
+'1.1',
+NULL,
+10,
+0,
+1,
+1,
+1,
+1,
+0,
+'tool/laqa11/learningStarter.do',
+'tool/laqa11/authoringStarter.do',
+'tool/laqa11/definelater.do',
+'tool/laqa11/export.do',
+'tool/laqa11/monitoringStarter.do',
+'tool/laqa11/monitoringStarter.do',
+'tool/laqa11/monitoringStarter.do',
+NOW()
+);
+
+INSERT INTO lams_learning_library
+(
+learning_library_id,
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+3,
+'Question and Answer Learning Library Description',
+'Question and Answer',
+0,
+NOW()
+);
+
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+)
+VALUES
+(
+NULL
+, 'Question and Answer Description'
+, 'Question and Answer'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 1
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, 3
+, NOW()
+, 0
+, NULL
+, NULL
+, NULL
+, 3
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, 'tool/laqa11/images/icon_questionanswer.swf'
+, NULL
+, NULL
+, NULL
+);
+
+
+
Index: lams_tool_forum/db/model/forum.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/model/forum.clay,v
diff -u -r1.20 -r1.21
--- lams_tool_forum/db/model/forum.clay 2 Feb 2009 03:47:05 -0000 1.20
+++ lams_tool_forum/db/model/forum.clay 7 Jul 2009 00:43:59 -0000 1.21
@@ -1,1145 +1,1145 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql 7 Nov 2008 01:38:31 -0000 1.3
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql 7 Jul 2009 00:43:35 -0000 1.4
@@ -1,33 +1,33 @@
--- SQL statements to update from LAMS 2.1/2.1.1
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-CREATE TABLE tl_lafrum11_conditions (
- condition_id BIGINT(20) NOT NULL
- , content_uid BIGINT(20)
- , PRIMARY KEY (condition_id)
- , CONSTRAINT ForumConditionInheritance FOREIGN KEY (condition_id)
- REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid)
- REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-CREATE TABLE tl_lafrum11_condition_topics (
- condition_id BIGINT(20)
- , topic_uid BIGINT(20)
- , PRIMARY KEY (condition_id,topic_uid)
- , CONSTRAINT ForumConditionQuestionToForumCondition FOREIGN KEY (condition_id)
- REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid)
- REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-ALTER TABLE tl_lafrum11_forum ADD COLUMN mark_release_notify tinyint DEFAULT 0;
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.1/2.1.1
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+CREATE TABLE tl_lafrum11_conditions (
+ condition_id BIGINT(20) NOT NULL
+ , content_uid BIGINT(20)
+ , PRIMARY KEY (condition_id)
+ , CONSTRAINT ForumConditionInheritance FOREIGN KEY (condition_id)
+ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid)
+ REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE tl_lafrum11_condition_topics (
+ condition_id BIGINT(20)
+ , topic_uid BIGINT(20)
+ , PRIMARY KEY (condition_id,topic_uid)
+ , CONSTRAINT ForumConditionQuestionToForumCondition FOREIGN KEY (condition_id)
+ REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid)
+ REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+ALTER TABLE tl_lafrum11_forum ADD COLUMN mark_release_notify tinyint DEFAULT 0;
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql 2 Jul 2009 08:19:35 -0000 1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql 7 Jul 2009 00:43:36 -0000 1.3
@@ -1,29 +1,29 @@
--- SQL statements to update from LAMS 2.2
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-UPDATE lams_tool SET pedagogical_planner_url='tool/lafrum11/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='lafrum11';
-
--- timestamp table
-create table tl_lafrum11_timestamp (
- uid BIGINT(20) not null auto_increment,
- message_uid BIGINT(20) not null,
- timestamp_date DATETIME not null,
- forum_user_uid BIGINT(20) not null,
- primary key (`uid`),
- unique key `uid` (`uid`),
- key `message_uid` (`message_uid`),
- key `forum_user_uid` (`forum_user_uid`)
-)TYPE=InnoDB;
-
-alter table tl_lafrum11_timestamp add index ForumUserFK (forum_user_uid), add constraint ForumUserFK foreign key (forum_user_uid) references tl_lafrum11_forum_user (uid);
-alter table tl_lafrum11_timestamp add index MessageFK (message_uid), add constraint MessageFK foreign key (message_uid) references tl_lafrum11_message (uid);
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+UPDATE lams_tool SET pedagogical_planner_url='tool/lafrum11/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='lafrum11';
+
+-- timestamp table
+create table tl_lafrum11_timestamp (
+ uid BIGINT(20) not null auto_increment,
+ message_uid BIGINT(20) not null,
+ timestamp_date DATETIME not null,
+ forum_user_uid BIGINT(20) not null,
+ primary key (`uid`),
+ unique key `uid` (`uid`),
+ key `message_uid` (`message_uid`),
+ key `forum_user_uid` (`forum_user_uid`)
+)TYPE=InnoDB;
+
+alter table tl_lafrum11_timestamp add index ForumUserFK (forum_user_uid), add constraint ForumUserFK foreign key (forum_user_uid) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_timestamp add index MessageFK (message_uid), add constraint MessageFK foreign key (message_uid) references tl_lafrum11_message (uid);
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_images/db/model/imageGallery.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/db/model/imageGallery.clay,v
diff -u -r1.4 -r1.5
--- lams_tool_images/db/model/imageGallery.clay 16 Dec 2008 18:16:12 -0000 1.4
+++ lams_tool_images/db/model/imageGallery.clay 7 Jul 2009 00:43:04 -0000 1.5
@@ -1,984 +1,984 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql 9 Dec 2008 05:38:09 -0000 1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql 7 Jul 2009 00:42:46 -0000 1.2
@@ -1,14 +1,14 @@
--- SQL statements to update from LAMS 2.2
-
--- Turn off autocommit, so nothing is committed if there is an error
-SET AUTOCOMMIT = 0;
-
-----------------------Put all sql statements below here-------------------------
-
-UPDATE lams_tool SET pedagogical_planner_url='tool/lamc11/pedagogicalPlanner.do' WHERE tool_signature='lamc11';
-
-----------------------Put all sql statements above here-------------------------
-
--- If there were no errors, commit and restore autocommit to on
-COMMIT;
+-- SQL statements to update from LAMS 2.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+UPDATE lams_tool SET pedagogical_planner_url='tool/lamc11/pedagogicalPlanner.do' WHERE tool_signature='lamc11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
SET AUTOCOMMIT = 1;
\ No newline at end of file