Index: lams_build/deploy-tool/deploy.bat
===================================================================
diff -u -rf09e854442df997c78ef3cdc6cbe6c68c20afc10 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_build/deploy-tool/deploy.bat (.../deploy.bat) (revision f09e854442df997c78ef3cdc6cbe6c68c20afc10)
+++ lams_build/deploy-tool/deploy.bat (.../deploy.bat) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1 +1 @@
-java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.0.8-bin.jar;lib/xstream-1.1.2.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
+java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-5.0.8-bin.jar;lib/xstream-1.1.2.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/liblist.conf
===================================================================
diff -u -r5d9800f9d3426c995d1112886edca9efba50691a -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_build/liblist.conf (.../liblist.conf) (revision 5d9800f9d3426c995d1112886edca9efba50691a)
+++ lams_build/liblist.conf (.../liblist.conf) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql (.../patch0017_updateFrom23-231.sql) (revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql (.../patch0017_updateFrom23-231.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r57cfef36c82a058441720eaae5c02a1eff6decbf -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql (.../patch0017_updateFrom23.sql) (revision 57cfef36c82a058441720eaae5c02a1eff6decbf)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql (.../patch0017_updateFrom23.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql (.../patch20090612_updateTo231.sql) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20090612_updateTo231.sql (.../patch20090612_updateTo231.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r5dab5904038c73f8cb902dda9c77bf9483c08279 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql (.../updateTo20070315.sql) (revision 5dab5904038c73f8cb902dda9c77bf9483c08279)
+++ lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql (.../updateTo20070315.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r667583f574672f48a6777c6d3e7e0f6b7a06d3f7 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql (.../patch20081027_updateFrom21.sql) (revision 667583f574672f48a6777c6d3e7e0f6b7a06d3f7)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql (.../patch20081027_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql (.../patch20081125_updateFrom22.sql) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081125_updateFrom22.sql (.../patch20081125_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -ra4e564624bbf22983634d0e77a2e467403d0d7e5 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/clear_old_learning_session.sql (.../clear_old_learning_session.sql) (revision a4e564624bbf22983634d0e77a2e467403d0d7e5)
+++ lams_tool_daco/db/clear_old_learning_session.sql (.../clear_old_learning_session.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -ra8e7e92f2121c4b307fb49d28008a5828ad58c58 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/model/daco.clay (.../daco.clay) (revision a8e7e92f2121c4b307fb49d28008a5828ad58c58)
+++ lams_tool_daco/db/model/daco.clay (.../daco.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,896 +1,896 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_daco/db/sql/activity_insert.sql
===================================================================
diff -u -rc05d49aab98027ef4925fa183ec639df9bc24356 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/sql/activity_insert.sql (.../activity_insert.sql) (revision c05d49aab98027ef4925fa183ec639df9bc24356)
+++ lams_tool_daco/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rd76e13fea785246cc091078e2b8eb460cc7bf342 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision d76e13fea785246cc091078e2b8eb460cc7bf342)
+++ lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/sql/drop_lams_tool_daco.sql (.../drop_lams_tool_daco.sql) (revision 843648563725cffa91af1dfd96dce9682d39b410)
+++ lams_tool_daco/db/sql/drop_lams_tool_daco.sql (.../drop_lams_tool_daco.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/sql/library_insert.sql (.../library_insert.sql) (revision 843648563725cffa91af1dfd96dce9682d39b410)
+++ lams_tool_daco/db/sql/library_insert.sql (.../library_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_daco/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r955a2a0ed552a7c8e8ffd9894cac59233e56747e -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql (.../patch20081114_updateFrom21.sql) (revision 955a2a0ed552a7c8e8ffd9894cac59233e56747e)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20081114_updateFrom21.sql (.../patch20081114_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rd76e13fea785246cc091078e2b8eb460cc7bf342 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql (.../patch20090326_updateFrom22.sql) (revision d76e13fea785246cc091078e2b8eb460cc7bf342)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20090326_updateFrom22.sql (.../patch20090326_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rda85d240e28623bc3db1763c40caa72729863285 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_deploy/test/file/sql/drop_tool_tables.sql (.../drop_tool_tables.sql) (revision da85d240e28623bc3db1763c40caa72729863285)
+++ lams_tool_deploy/test/file/sql/drop_tool_tables.sql (.../drop_tool_tables.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rda85d240e28623bc3db1763c40caa72729863285 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_deploy/test/file/sql/insert_library_test_data.sql (.../insert_library_test_data.sql) (revision da85d240e28623bc3db1763c40caa72729863285)
+++ lams_tool_deploy/test/file/sql/insert_library_test_data.sql (.../insert_library_test_data.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -r1ae8432cf0f8181c141ed27a1a6560ff1d771270 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_forum/db/model/forum.clay (.../forum.clay) (revision 1ae8432cf0f8181c141ed27a1a6560ff1d771270)
+++ lams_tool_forum/db/model/forum.clay (.../forum.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,1145 +1,1145 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql
===================================================================
diff -u -r59550921a627a4ca6f9b83cdff15082656c140b1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql (.../patch20081022_updateFrom21.sql) (revision 59550921a627a4ca6f9b83cdff15082656c140b1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql (.../patch20081022_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
===================================================================
diff -u -rdb681dba0a5e44ae9f4e4cf6b9bc575d6175212f -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_images/db/model/imageGallery.clay (.../imageGallery.clay) (revision db681dba0a5e44ae9f4e4cf6b9bc575d6175212f)
+++ lams_tool_images/db/model/imageGallery.clay (.../imageGallery.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,984 +1,984 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql (.../patch20081127_updateFrom22.sql) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20081127_updateFrom22.sql (.../patch20081127_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
diff -u -r0af4ed13b963a588f3499b080801863d57f8ad95 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision 0af4ed13b963a588f3499b080801863d57f8ad95)
+++ lams_tool_laqa/db/model/lams_tool_qa.clay (.../lams_tool_qa.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,784 +1,784 @@
-
-
-
-QA Tool for Lams 1.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+QA Tool for Lams 1.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql
===================================================================
diff -u -r014c90f20614f95033e08273fc00c81ff0c94638 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql (.../patch20080926_updateFrom21.sql) (revision 014c90f20614f95033e08273fc00c81ff0c94638)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql (.../patch20080926_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,75 +1,75 @@
--- 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
-CREATE TABLE tl_laqa11_conditions (
- condition_id BIGINT(20) NOT NULL
- , content_uid BIGINT(20)
- , PRIMARY KEY (condition_id)
- , CONSTRAINT QaConditionInheritance FOREIGN KEY (condition_id)
- REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT QaConditionToQaContent FOREIGN KEY (content_uid)
- REFERENCES tl_laqa11_content(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-CREATE TABLE tl_laqa11_condition_questions (
- condition_id BIGINT(20)
- , question_uid BIGINT(20)
- , PRIMARY KEY (condition_id,question_uid)
- , CONSTRAINT QaConditionQuestionToQaCondition FOREIGN KEY (condition_id)
- REFERENCES tl_laqa11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT QaConditionQuestionToQaQuestion FOREIGN KEY (question_uid)
- REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='laqa11';
-
--- Condition copies created for branch activity entries won't have links to any existing Q&A contents.
-ALTER TABLE tl_laqa11_que_content MODIFY COLUMN qa_content_id BIGINT(20);
-
-SET FOREIGN_KEY_CHECKS=0;
-
--- insert scripts for the wizard tables
-create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB;
-create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))TYPE=InnoDB;
-create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))TYPE=InnoDB;
-create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))TYPE=InnoDB;
-alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid);
-alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid);
-
--- Inserting the required config item into the config table
-INSERT INTO tl_laqa11_configuration (
- config_key,
- config_value
-)
-VALUES(
- "enableQaWizard",
- "false"
-);
-SET FOREIGN_KEY_CHECKS=1;
-
--- updating q&a to have an admin page for the qa wizard
-UPDATE lams_tool SET admin_url='tool/laqa11/laqa11admin.do' WHERE tool_signature='laqa11';
-
-
--- Dumps for qaWizard default content
-
--- Wizard categories
-INSERT INTO tl_laqa11_wizard_category VALUES (1,'Data%20Collection'),(2,'Data%20Organization'),(3,'Data%20Analysis'),(4,'Data%20Transcendence');
-
--- Wizard cognitive skills
-INSERT INTO tl_laqa11_wizard_cognitive_skill VALUES (1,'2.%20Recognition',1),(2,'1.%20Observation',1),(3,'3.%20Recall',1),(4,'Ordering',2),(5,'Comparison',2),(6,'Hierarchy',2),(7,'Classification',2),(8,'Distinction%20between%20facts%20%26%20opinions/judgments',3),(9,'Analysis%20of%20basic%20parts',3),(10,'Clarification',3),(11,'Flush%20out%20relationships',3),(12,'Pattern%20recognition',3),(13,'Error%20and%20conflict%20detection',4),(14,'Summary',4),(15,'Reflection',4),(16,'Hypothesis',4),(17,'Prediction',4),(18,'Explanation',4),(19,'Empathy',4),(20,'Knowledge%20Organization',4),(21,'Application%20and%20Improvement',4),(22,'Assessment/Evaluation',4),(23,'Verification',4),(24,'Conclusion',4);
-
--- Wizard questions
-INSERT INTO tl_laqa11_wizard_question VALUES (1,1,'Please%20identify%u2026'),(2,2,'What%20do%20you%20observe%20...'),(3,2,'What%20do%20you%20see%u2026%3F'),(4,3,'Give%20the%20definition%20of%u2026'),(5,3,'What%20is%20the%20meaning%20of%u2026%3F'),(6,3,'What%20has%20been%20said%20by%u2026%20about%u2026%3F'),(7,4,'Find%20a%20criterion%20to%20order%20these%u2026'),(8,4,'Order%20these%u2026'),(9,4,'Find%20the%205%20biggest/smallest%20%u2026'),(10,5,'Compare%20these%u2026%20using%20the%20following%20criteria%u2026'),(11,5,'Find%20the%20pros%20and%20cons%20of%u2026'),(12,5,'Find%20both%20the%20similarities%20and%20the%20differences%20between..%20and%u2026'),(13,6,'Arrange%20these%u2026by%20the%20following%20criterion%u2026'),(14,6,'Sort%20these%u2026%20by%20the%20following%20criterion%u2026'),(15,6,'Put%20these%u2026in%20an%20ascending/descending%20sequence%u2026'),(16,7,'Group%20these%20elements%20using%20the%20following%20criteria%u2026'),(17,7,'Find%20the%20pros%20and%20cons%20of%20these%u2026solutions'),(18,7,'Find%205%20%20advantages%20and%203%20disadvantages%20%20of%20%u2026'),(19,8,'Clarify%20whether%20this%20%u2026describes%20a%20fact%20or%20if%20it%20is%20a%20personal%20opinion'),(20,8,'Provide%20more%20than%20one%20view%20about%20the%20following%u2026'),(21,8,'Provide%20logical%20arguments%20to%20support%20the%20following%20statement'),(22,9,'Identify%20the%20parts/units/characteristics%20of%u2026'),(23,9,'Define%20the%20data%20given%20and%20the%20objectives%20of%u2026.'),(24,9,'Refer%20to%20the%20appropriate%20phases%20of%20the%20solution%20plan%20for%u2026'),(25,10,'What%20do%20we%20mean%20by%u2026%3F'),(26,10,'Provide%20an%20example%20to%20clarify%u2026'),(27,10,'When%20does%20this%u2026have%20a%20meaning%u2026%3F'),(28,11,'Distinguish%20possible%20relationships%20among%20the%20data%u2026'),(29,11,'Is%20there%20any%20reason%20that%20affects%20this%20phenomenon%u2026%3F'),(30,11,'Is%20there%20any%20structure%20within%u2026%3F'),(31,12,'Is%20there%20any%20pattern%20that%20is%20repeated%20in%u2026%3F'),(32,12,'Find%20out%20what%20is%20common%20in%u2026'),(33,12,'Find%20out%20what%20is%20similar%20in%u2026'),(34,13,'Point%20out%20the%20mistakes%20of/in%u2026'),(35,13,'Are%20there%20any%20contradictions%20in%u2026%3F'),(36,13,'What%20is%20missing%20in%u2026%3F'),(37,14,'Form%20an%20abstract%20of%20%u2026%28number%29%20words%20to%20describe%u2026'),(38,14,'Which%20are%20the%20main%20points%20of%20%u2026'),(39,14,'Which%20are%20the%20top%205%20essential%20points%20of%20%u2026'),(40,15,'What%20have%20you%20learnt%20about%u2026%3F'),(41,15,'Are%20there%20any%20points%20that%20you%u2026%3F'),(42,16,'If%20%u2026%20then%u2026'),(43,17,'Could%20you%20make%20any%20predictions%20about%u2026%3F'),(44,17,'If%20we%20do%u2026then%20what%20will%20happen%3F'),(45,17,'In%20the%20case%20of%u2026find%20out%u2026'),(46,18,'Please%20explain%20how%20the%20meaning%20of%u2026'),(47,18,'Please%20explain%20why%20the%20meaning%20of/%u2026'),(48,18,'Please%20explain%20what%20the%20meaning%20of%20%u2026'),(49,18,'Please%20explain%20in%20your%20own%20words%u2026'),(50,18,'Please%20explain%20in%20your%20own%20words%u2026'),(51,19,'Could%20you%20accept%20the%20role%20of%u2026%3F'),(52,19,'What%20are%20the%20possible%20arguments%20of%20others%20for%u2026%3F'),(53,19,'What%20would%20be%20your%20answer%20if%20you%20were%20in%20the%20position%20of%u2026%3F'),(54,20,'Make%20a%20hierarchical%20tree%20to%20describe%u2026'),(55,20,'Can%20you%20form%20a%20sequential%20structure%20of%u2026%3F'),(56,20,'Characterize%20it%20according%20to%20the%20following%20criteria%u2026'),(57,21,'How%20can%20you%20improve%20this%u2026in%20order%20to%u2026%3F'),(58,21,'How%20can%20you%20apply%20this%u2026in%20order%20to%u2026%3F'),(59,22,'Assess%20this%u2026'),(60,22,'Evaluate%20the%u2026'),(61,22,'What%20kind%20of%20criteria%20can%20you%20use%20to%20evaluate%20the%u2026%3F'),(62,23,'Please%20verify%20that%u2026'),(63,23,'Please%20confirm%20that%u2026'),(64,24,'Based%20on%20this%u2026what%20do%20you%20conclude%3F'),(65,24,'Based%20on%20these%u2026what%20do%20you%20conclude%3F'),(66,24,'Are%20there%20any%20exceptions%20to%u2026%3F'),(67,24,'Are%20there%20any%20weak%20points%20in%u2026%3F');
-
-----------------------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
+CREATE TABLE tl_laqa11_conditions (
+ condition_id BIGINT(20) NOT NULL
+ , content_uid BIGINT(20)
+ , PRIMARY KEY (condition_id)
+ , CONSTRAINT QaConditionInheritance FOREIGN KEY (condition_id)
+ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT QaConditionToQaContent FOREIGN KEY (content_uid)
+ REFERENCES tl_laqa11_content(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE tl_laqa11_condition_questions (
+ condition_id BIGINT(20)
+ , question_uid BIGINT(20)
+ , PRIMARY KEY (condition_id,question_uid)
+ , CONSTRAINT QaConditionQuestionToQaCondition FOREIGN KEY (condition_id)
+ REFERENCES tl_laqa11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT QaConditionQuestionToQaQuestion FOREIGN KEY (question_uid)
+ REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='laqa11';
+
+-- Condition copies created for branch activity entries won't have links to any existing Q&A contents.
+ALTER TABLE tl_laqa11_que_content MODIFY COLUMN qa_content_id BIGINT(20);
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- insert scripts for the wizard tables
+create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))TYPE=InnoDB;
+alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid);
+alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid);
+
+-- Inserting the required config item into the config table
+INSERT INTO tl_laqa11_configuration (
+ config_key,
+ config_value
+)
+VALUES(
+ "enableQaWizard",
+ "false"
+);
+SET FOREIGN_KEY_CHECKS=1;
+
+-- updating q&a to have an admin page for the qa wizard
+UPDATE lams_tool SET admin_url='tool/laqa11/laqa11admin.do' WHERE tool_signature='laqa11';
+
+
+-- Dumps for qaWizard default content
+
+-- Wizard categories
+INSERT INTO tl_laqa11_wizard_category VALUES (1,'Data%20Collection'),(2,'Data%20Organization'),(3,'Data%20Analysis'),(4,'Data%20Transcendence');
+
+-- Wizard cognitive skills
+INSERT INTO tl_laqa11_wizard_cognitive_skill VALUES (1,'2.%20Recognition',1),(2,'1.%20Observation',1),(3,'3.%20Recall',1),(4,'Ordering',2),(5,'Comparison',2),(6,'Hierarchy',2),(7,'Classification',2),(8,'Distinction%20between%20facts%20%26%20opinions/judgments',3),(9,'Analysis%20of%20basic%20parts',3),(10,'Clarification',3),(11,'Flush%20out%20relationships',3),(12,'Pattern%20recognition',3),(13,'Error%20and%20conflict%20detection',4),(14,'Summary',4),(15,'Reflection',4),(16,'Hypothesis',4),(17,'Prediction',4),(18,'Explanation',4),(19,'Empathy',4),(20,'Knowledge%20Organization',4),(21,'Application%20and%20Improvement',4),(22,'Assessment/Evaluation',4),(23,'Verification',4),(24,'Conclusion',4);
+
+-- Wizard questions
+INSERT INTO tl_laqa11_wizard_question VALUES (1,1,'Please%20identify%u2026'),(2,2,'What%20do%20you%20observe%20...'),(3,2,'What%20do%20you%20see%u2026%3F'),(4,3,'Give%20the%20definition%20of%u2026'),(5,3,'What%20is%20the%20meaning%20of%u2026%3F'),(6,3,'What%20has%20been%20said%20by%u2026%20about%u2026%3F'),(7,4,'Find%20a%20criterion%20to%20order%20these%u2026'),(8,4,'Order%20these%u2026'),(9,4,'Find%20the%205%20biggest/smallest%20%u2026'),(10,5,'Compare%20these%u2026%20using%20the%20following%20criteria%u2026'),(11,5,'Find%20the%20pros%20and%20cons%20of%u2026'),(12,5,'Find%20both%20the%20similarities%20and%20the%20differences%20between..%20and%u2026'),(13,6,'Arrange%20these%u2026by%20the%20following%20criterion%u2026'),(14,6,'Sort%20these%u2026%20by%20the%20following%20criterion%u2026'),(15,6,'Put%20these%u2026in%20an%20ascending/descending%20sequence%u2026'),(16,7,'Group%20these%20elements%20using%20the%20following%20criteria%u2026'),(17,7,'Find%20the%20pros%20and%20cons%20of%20these%u2026solutions'),(18,7,'Find%205%20%20advantages%20and%203%20disadvantages%20%20of%20%u2026'),(19,8,'Clarify%20whether%20this%20%u2026describes%20a%20fact%20or%20if%20it%20is%20a%20personal%20opinion'),(20,8,'Provide%20more%20than%20one%20view%20about%20the%20following%u2026'),(21,8,'Provide%20logical%20arguments%20to%20support%20the%20following%20statement'),(22,9,'Identify%20the%20parts/units/characteristics%20of%u2026'),(23,9,'Define%20the%20data%20given%20and%20the%20objectives%20of%u2026.'),(24,9,'Refer%20to%20the%20appropriate%20phases%20of%20the%20solution%20plan%20for%u2026'),(25,10,'What%20do%20we%20mean%20by%u2026%3F'),(26,10,'Provide%20an%20example%20to%20clarify%u2026'),(27,10,'When%20does%20this%u2026have%20a%20meaning%u2026%3F'),(28,11,'Distinguish%20possible%20relationships%20among%20the%20data%u2026'),(29,11,'Is%20there%20any%20reason%20that%20affects%20this%20phenomenon%u2026%3F'),(30,11,'Is%20there%20any%20structure%20within%u2026%3F'),(31,12,'Is%20there%20any%20pattern%20that%20is%20repeated%20in%u2026%3F'),(32,12,'Find%20out%20what%20is%20common%20in%u2026'),(33,12,'Find%20out%20what%20is%20similar%20in%u2026'),(34,13,'Point%20out%20the%20mistakes%20of/in%u2026'),(35,13,'Are%20there%20any%20contradictions%20in%u2026%3F'),(36,13,'What%20is%20missing%20in%u2026%3F'),(37,14,'Form%20an%20abstract%20of%20%u2026%28number%29%20words%20to%20describe%u2026'),(38,14,'Which%20are%20the%20main%20points%20of%20%u2026'),(39,14,'Which%20are%20the%20top%205%20essential%20points%20of%20%u2026'),(40,15,'What%20have%20you%20learnt%20about%u2026%3F'),(41,15,'Are%20there%20any%20points%20that%20you%u2026%3F'),(42,16,'If%20%u2026%20then%u2026'),(43,17,'Could%20you%20make%20any%20predictions%20about%u2026%3F'),(44,17,'If%20we%20do%u2026then%20what%20will%20happen%3F'),(45,17,'In%20the%20case%20of%u2026find%20out%u2026'),(46,18,'Please%20explain%20how%20the%20meaning%20of%u2026'),(47,18,'Please%20explain%20why%20the%20meaning%20of/%u2026'),(48,18,'Please%20explain%20what%20the%20meaning%20of%20%u2026'),(49,18,'Please%20explain%20in%20your%20own%20words%u2026'),(50,18,'Please%20explain%20in%20your%20own%20words%u2026'),(51,19,'Could%20you%20accept%20the%20role%20of%u2026%3F'),(52,19,'What%20are%20the%20possible%20arguments%20of%20others%20for%u2026%3F'),(53,19,'What%20would%20be%20your%20answer%20if%20you%20were%20in%20the%20position%20of%u2026%3F'),(54,20,'Make%20a%20hierarchical%20tree%20to%20describe%u2026'),(55,20,'Can%20you%20form%20a%20sequential%20structure%20of%u2026%3F'),(56,20,'Characterize%20it%20according%20to%20the%20following%20criteria%u2026'),(57,21,'How%20can%20you%20improve%20this%u2026in%20order%20to%u2026%3F'),(58,21,'How%20can%20you%20apply%20this%u2026in%20order%20to%u2026%3F'),(59,22,'Assess%20this%u2026'),(60,22,'Evaluate%20the%u2026'),(61,22,'What%20kind%20of%20criteria%20can%20you%20use%20to%20evaluate%20the%u2026%3F'),(62,23,'Please%20verify%20that%u2026'),(63,23,'Please%20confirm%20that%u2026'),(64,24,'Based%20on%20this%u2026what%20do%20you%20conclude%3F'),(65,24,'Based%20on%20these%u2026what%20do%20you%20conclude%3F'),(66,24,'Are%20there%20any%20exceptions%20to%u2026%3F'),(67,24,'Are%20there%20any%20weak%20points%20in%u2026%3F');
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20081126_updateFrom22.sql
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20081126_updateFrom22.sql (.../patch20081126_updateFrom22.sql) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20081126_updateFrom22.sql (.../patch20081126_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,16 +1,16 @@
--- 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/laqa11/pedagogicalPlanner.do' WHERE tool_signature='laqa11';
-
-alter table tl_laqa11_content add column allow_rich_editor TINYINT(1) NOT NULL 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.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/laqa11/pedagogicalPlanner.do' WHERE tool_signature='laqa11';
+
+alter table tl_laqa11_content add column allow_rich_editor TINYINT(1) NOT NULL 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_larsrc/db/model/resource.clay
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/model/resource.clay (.../resource.clay) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_larsrc/db/model/resource.clay (.../resource.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,873 +1,873 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_larsrc/db/sql/activity_insert.sql
===================================================================
diff -u -r9b6c2247e8f1e9f153f6a0a4514c5575d1f20ce9 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 9b6c2247e8f1e9f153f6a0a4514c5575d1f20ce9)
+++ lams_tool_larsrc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
-, 'Share Resources'
-, 'Share Resources'
-, 'Put some help text here.'
-, NULL
-, NULL
-, NULL
-, NULL
-, 1
-, 2
-, 0
-, NULL
-, NULL
-, NULL
-, 0
-, NULL
-, ${learning_library_id}
-, NOW()
-, 0
-, NULL
-, NULL
-, NULL
-, ${tool_id}
-, NULL
-, 4
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, NULL
-, 'tool/larsrc11/images/icon_rsrc.swf'
-, NULL
-, NULL
-, NULL
-, 'org.lamsfoundation.lams.tool.rsrc.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
+, 'Share Resources'
+, 'Share Resources'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 2
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, ${learning_library_id}
+, NOW()
+, 0
+, NULL
+, NULL
+, NULL
+, ${tool_id}
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, 'tool/larsrc11/images/icon_rsrc.swf'
+, NULL
+, NULL
+, NULL
+, 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources'
+)
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,125 +1,125 @@
-SET FOREIGN_KEY_CHECKS=0;
-drop table if exists tl_larsrc11_attachment;
-drop table if exists tl_larsrc11_item_instruction;
-drop table if exists tl_larsrc11_resource;
-drop table if exists tl_larsrc11_resource_item;
-drop table if exists tl_larsrc11_resource_item_visit_log;
-drop table if exists tl_larsrc11_session;
-drop table if exists tl_larsrc11_user;
-create table tl_larsrc11_attachment (
- uid bigint not null auto_increment,
- file_version_id bigint,
- file_type varchar(255),
- file_name varchar(255),
- file_uuid bigint,
- create_date datetime,
- resource_uid bigint,
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_item_instruction (
- uid bigint not null auto_increment,
- description varchar(255),
- sequence_id integer,
- item_uid bigint,
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_resource (
- uid bigint not null auto_increment,
- create_date datetime,
- update_date datetime,
- create_by bigint,
- title varchar(255),
- run_offline tinyint,
- lock_on_finished tinyint,
- instructions text,
- online_instructions text,
- offline_instructions text,
- content_in_use tinyint,
- define_later tinyint,
- content_id bigint unique,
- allow_add_files tinyint,
- allow_add_urls tinyint,
- mini_view_resource_number integer,
- allow_auto_run tinyint,
- reflect_instructions varchar(255),
- reflect_on_activity smallint,
- assigment_submit_notify tinyint DEFAULT 0,
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_resource_item (
- uid bigint not null auto_increment,
- file_uuid bigint,
- file_version_id bigint,
- description varchar(255),
- ims_schema varchar(255),
- init_item varchar(255),
- organization_xml text,
- title varchar(255),
- url text,
- create_by bigint,
- create_date datetime,
- create_by_author tinyint,
- is_hide tinyint,
- item_type smallint,
- file_type varchar(255),
- file_name varchar(255),
- open_url_new_window tinyint,
- resource_uid bigint,
- session_uid bigint,
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_item_log (
- uid bigint not null auto_increment,
- access_date datetime,
- resource_item_uid bigint,
- user_uid bigint,
- complete tinyint,
- session_id bigint,
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_session (
- uid bigint not null auto_increment,
- session_end_date datetime,
- session_start_date datetime,
- status integer,
- resource_uid bigint,
- session_id bigint,
- session_name varchar(250),
- primary key (uid)
-)type=innodb;
-create table tl_larsrc11_user (
- 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,
- resource_uid bigint,
- primary key (uid)
-)type=innodb;
-alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid);
-alter table tl_larsrc11_resource add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid);
-alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid);
-alter table tl_larsrc11_resource_item add index FKF52D1F9330E79035 (resource_uid), add constraint FKF52D1F9330E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-alter table tl_larsrc11_resource_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
-alter table tl_larsrc11_item_log add index FK693580A438BF8DFE (resource_item_uid), add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
-alter table tl_larsrc11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid);
-alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
-alter table tl_larsrc11_user add index FK30113BFC309ED320 (resource_uid), add constraint FK30113BFC309ED320 foreign key (resource_uid) references tl_larsrc11_resource (uid);
-
-
-
-INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
- `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`,
- `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`,`reflect_on_activity`) VALUES
- (1,NULL,NULL,NULL,'Resources','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0);
-
-INSERT INTO `tl_larsrc11_resource_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `resource_uid`, `session_uid`) VALUES
- (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL);
-INSERT INTO `tl_larsrc11_item_instruction` (`uid`, `description`, `sequence_id`, `item_uid`) VALUES
- (1,'Use Google to search the web',0,1);
-
+SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_larsrc11_attachment;
+drop table if exists tl_larsrc11_item_instruction;
+drop table if exists tl_larsrc11_resource;
+drop table if exists tl_larsrc11_resource_item;
+drop table if exists tl_larsrc11_resource_item_visit_log;
+drop table if exists tl_larsrc11_session;
+drop table if exists tl_larsrc11_user;
+create table tl_larsrc11_attachment (
+ uid bigint not null auto_increment,
+ file_version_id bigint,
+ file_type varchar(255),
+ file_name varchar(255),
+ file_uuid bigint,
+ create_date datetime,
+ resource_uid bigint,
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_item_instruction (
+ uid bigint not null auto_increment,
+ description varchar(255),
+ sequence_id integer,
+ item_uid bigint,
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_resource (
+ uid bigint not null auto_increment,
+ create_date datetime,
+ update_date datetime,
+ create_by bigint,
+ title varchar(255),
+ run_offline tinyint,
+ lock_on_finished tinyint,
+ instructions text,
+ online_instructions text,
+ offline_instructions text,
+ content_in_use tinyint,
+ define_later tinyint,
+ content_id bigint unique,
+ allow_add_files tinyint,
+ allow_add_urls tinyint,
+ mini_view_resource_number integer,
+ allow_auto_run tinyint,
+ reflect_instructions varchar(255),
+ reflect_on_activity smallint,
+ assigment_submit_notify tinyint DEFAULT 0,
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_resource_item (
+ uid bigint not null auto_increment,
+ file_uuid bigint,
+ file_version_id bigint,
+ description varchar(255),
+ ims_schema varchar(255),
+ init_item varchar(255),
+ organization_xml text,
+ title varchar(255),
+ url text,
+ create_by bigint,
+ create_date datetime,
+ create_by_author tinyint,
+ is_hide tinyint,
+ item_type smallint,
+ file_type varchar(255),
+ file_name varchar(255),
+ open_url_new_window tinyint,
+ resource_uid bigint,
+ session_uid bigint,
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_item_log (
+ uid bigint not null auto_increment,
+ access_date datetime,
+ resource_item_uid bigint,
+ user_uid bigint,
+ complete tinyint,
+ session_id bigint,
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_session (
+ uid bigint not null auto_increment,
+ session_end_date datetime,
+ session_start_date datetime,
+ status integer,
+ resource_uid bigint,
+ session_id bigint,
+ session_name varchar(250),
+ primary key (uid)
+)type=innodb;
+create table tl_larsrc11_user (
+ 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,
+ resource_uid bigint,
+ primary key (uid)
+)type=innodb;
+alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
+alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid);
+alter table tl_larsrc11_resource add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid);
+alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid);
+alter table tl_larsrc11_resource_item add index FKF52D1F9330E79035 (resource_uid), add constraint FKF52D1F9330E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
+alter table tl_larsrc11_resource_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_item_log add index FK693580A438BF8DFE (resource_item_uid), add constraint FK693580A438BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
+alter table tl_larsrc11_item_log add index FK693580A441F9365D (user_uid), add constraint FK693580A441F9365D foreign key (user_uid) references tl_larsrc11_user (uid);
+alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
+alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
+alter table tl_larsrc11_user add index FK30113BFC309ED320 (resource_uid), add constraint FK30113BFC309ED320 foreign key (resource_uid) references tl_larsrc11_resource (uid);
+
+
+
+INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
+ `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`,
+ `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`,`reflect_on_activity`) VALUES
+ (1,NULL,NULL,NULL,'Resources','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0);
+
+INSERT INTO `tl_larsrc11_resource_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `resource_uid`, `session_uid`) VALUES
+ (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL);
+INSERT INTO `tl_larsrc11_item_instruction` (`uid`, `description`, `sequence_id`, `item_uid`) VALUES
+ (1,'Use Google to search the web',0,1);
+
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql
===================================================================
diff -u -r4812e830a27ccc4127bc6f3043258b16776f314b -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql (.../drop_lams_tool_rsrc.sql) (revision 4812e830a27ccc4127bc6f3043258b16776f314b)
+++ lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql (.../drop_lams_tool_rsrc.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,14 +1,14 @@
-SET FOREIGN_KEY_CHECKS=0;
-drop table if exists tl_larsrc11_attachment;
-drop table if exists tl_larsrc11_item_instruction;
-drop table if exists tl_larsrc11_resource;
-drop table if exists tl_larsrc11_resource_item;
-drop table if exists tl_larsrc11_item_log;
-drop table if exists tl_larsrc11_session;
-drop table if exists tl_larsrc11_user;
-SET FOREIGN_KEY_CHECKS=1;
-
-
-
-
-
+SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_larsrc11_attachment;
+drop table if exists tl_larsrc11_item_instruction;
+drop table if exists tl_larsrc11_resource;
+drop table if exists tl_larsrc11_resource_item;
+drop table if exists tl_larsrc11_item_log;
+drop table if exists tl_larsrc11_session;
+drop table if exists tl_larsrc11_user;
+SET FOREIGN_KEY_CHECKS=1;
+
+
+
+
+
Index: lams_tool_larsrc/db/sql/library_insert.sql
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/sql/library_insert.sql (.../library_insert.sql) (revision 0a704617c31a5847217132f6b7cd73a4b9b43c9f)
+++ lams_tool_larsrc/db/sql/library_insert.sql (.../library_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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
-(
-'Share resources',
-'Share resources',
-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
+(
+'Share resources',
+'Share resources',
+0,
+NOW()
+)
Index: lams_tool_larsrc/db/sql/tool_insert.sql
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_larsrc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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,
-pedagogical_planner_url,
-help_url,
-language_file,
-create_date_time,
-modified_date_time
-)
-VALUES
-(
-'larsrc11',
-'resourceService',
-'Shared Resources',
-'Shared Resources',
-'sharedresources',
-'@tool_version@',
-NULL,
-NULL,
-0,
-2,
-1,
-'tool/larsrc11/learning/start.do?mode=learner',
-'tool/larsrc11/learning/start.do?mode=author',
-'tool/larsrc11/learning/start.do?mode=teacher',
-'tool/larsrc11/authoring/start.do',
-'tool/larsrc11/monitoring/summary.do',
-'tool/larsrc11/definelater.do',
-'tool/larsrc11/exportPortfolio?mode=learner',
-'tool/larsrc11/exportPortfolio?mode=teacher',
-'tool/larsrc11/contribute.do',
-'tool/larsrc11/moderate.do',
-'tool/larsrc11/authoring/initPedagogicalPlannerForm.do',
-'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11',
-'org.lamsfoundation.lams.tool.rsrc.ApplicationResources',
-NOW(),
-NOW()
-)
+# 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,
+pedagogical_planner_url,
+help_url,
+language_file,
+create_date_time,
+modified_date_time
+)
+VALUES
+(
+'larsrc11',
+'resourceService',
+'Shared Resources',
+'Shared Resources',
+'sharedresources',
+'@tool_version@',
+NULL,
+NULL,
+0,
+2,
+1,
+'tool/larsrc11/learning/start.do?mode=learner',
+'tool/larsrc11/learning/start.do?mode=author',
+'tool/larsrc11/learning/start.do?mode=teacher',
+'tool/larsrc11/authoring/start.do',
+'tool/larsrc11/monitoring/summary.do',
+'tool/larsrc11/definelater.do',
+'tool/larsrc11/exportPortfolio?mode=learner',
+'tool/larsrc11/exportPortfolio?mode=teacher',
+'tool/larsrc11/contribute.do',
+'tool/larsrc11/moderate.do',
+'tool/larsrc11/authoring/initPedagogicalPlannerForm.do',
+'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11',
+'org.lamsfoundation.lams.tool.rsrc.ApplicationResources',
+NOW(),
+NOW()
+)
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20081107_updateFrom21.sql
===================================================================
diff -u -r59550921a627a4ca6f9b83cdff15082656c140b1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20081107_updateFrom21.sql (.../patch20081107_updateFrom21.sql) (revision 59550921a627a4ca6f9b83cdff15082656c140b1)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20081107_updateFrom21.sql (.../patch20081107_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,14 +1,14 @@
--- 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-------------------------
-
-ALTER TABLE tl_larsrc11_resource ADD COLUMN assigment_submit_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-------------------------
+
+ALTER TABLE tl_larsrc11_resource ADD COLUMN assigment_submit_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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090115_updateFrom22.sql
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090115_updateFrom22.sql (.../patch20090115_updateFrom22.sql) (revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090115_updateFrom22.sql (.../patch20090115_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/larsrc11/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='larsrc11';
-
-----------------------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/larsrc11/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='larsrc11';
+
+----------------------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_nb/db/model/lams_tool_nb.clay
===================================================================
diff -u -r89b6e076006b36f7edcf712cfa97b87ef9010e23 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_nb/db/model/lams_tool_nb.clay (.../lams_tool_nb.clay) (revision 89b6e076006b36f7edcf712cfa97b87ef9010e23)
+++ lams_tool_nb/db/model/lams_tool_nb.clay (.../lams_tool_nb.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,394 +1,394 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_nb/db/sql/updatescripts/updateTo20070315.sql
===================================================================
diff -u -r5dab5904038c73f8cb902dda9c77bf9483c08279 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_nb/db/sql/updatescripts/updateTo20070315.sql (.../updateTo20070315.sql) (revision 5dab5904038c73f8cb902dda9c77bf9483c08279)
+++ lams_tool_nb/db/sql/updatescripts/updateTo20070315.sql (.../updateTo20070315.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,6 +1,6 @@
--- Update the Noticeboard tables to 20070315
--- This is for the LAMS 2.0.2 release.
-
-ALTER TABLE tl_lanb11_user CHANGE COLUMN username username VARCHAR(255), CHANGE COLUMN fullname fullname VARCHAR(255);
-
-UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lanb11.jar', context_file = '/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml' where tool_signature = 'lanb11';
+-- Update the Noticeboard tables to 20070315
+-- This is for the LAMS 2.0.2 release.
+
+ALTER TABLE tl_lanb11_user CHANGE COLUMN username username VARCHAR(255), CHANGE COLUMN fullname fullname VARCHAR(255);
+
+UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lanb11.jar', context_file = '/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml' where tool_signature = 'lanb11';
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
===================================================================
diff -u -r667583f574672f48a6777c6d3e7e0f6b7a06d3f7 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql (.../patch20080929_updateFrom21.sql) (revision 667583f574672f48a6777c6d3e7e0f6b7a06d3f7)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql (.../patch20080929_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,24 +1,24 @@
--- 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_lantbk11_conditions (
- condition_id BIGINT(20) NOT NULL
- , content_uid BIGINT(20)
- , PRIMARY KEY (condition_id)
- , CONSTRAINT NotebookConditionInheritance FOREIGN KEY (condition_id)
- REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid)
- REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lantbk11';
-
-----------------------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_lantbk11_conditions (
+ condition_id BIGINT(20) NOT NULL
+ , content_uid BIGINT(20)
+ , PRIMARY KEY (condition_id)
+ , CONSTRAINT NotebookConditionInheritance FOREIGN KEY (condition_id)
+ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid)
+ REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lantbk11';
+
+----------------------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_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/lantbk11/pedagogicalPlanner.do' WHERE tool_signature='lantbk11';
-
-----------------------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/lantbk11/pedagogicalPlanner.do' WHERE tool_signature='lantbk11';
+
+----------------------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_sbmt/db/model/lams_tool_sbmt.clay
===================================================================
diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_sbmt/db/model/lams_tool_sbmt.clay (.../lams_tool_sbmt.clay) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7)
+++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay (.../lams_tool_sbmt.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,583 +1,583 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20081107_updateFrom21.sql
===================================================================
diff -u -r59550921a627a4ca6f9b83cdff15082656c140b1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20081107_updateFrom21.sql (.../patch20081107_updateFrom21.sql) (revision 59550921a627a4ca6f9b83cdff15082656c140b1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20081107_updateFrom21.sql (.../patch20081107_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,15 +1,15 @@
--- 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-------------------------
-
-ALTER TABLE tl_lasbmt11_content ADD COLUMN mark_release_notify tinyint DEFAULT 0;
-ALTER TABLE tl_lasbmt11_content ADD COLUMN file_submit_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-------------------------
+
+ALTER TABLE tl_lasbmt11_content ADD COLUMN mark_release_notify tinyint DEFAULT 0;
+ALTER TABLE tl_lasbmt11_content ADD COLUMN file_submit_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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090113_updateFrom22.sql
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090113_updateFrom22.sql (.../patch20090113_updateFrom22.sql) (revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20090113_updateFrom22.sql (.../patch20090113_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/lasbmt11/pedagogicalPlanner.do' WHERE tool_signature='lasbmt11';
-
-----------------------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/lasbmt11/pedagogicalPlanner.do' WHERE tool_signature='lasbmt11';
+
+----------------------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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20090226_updateFrom22.sql
===================================================================
diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20090226_updateFrom22.sql (.../patch20090226_updateFrom22.sql) (revision 8f7975d272f91acc26c785848d82d26d6b5dd357)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20090226_updateFrom22.sql (.../patch20090226_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/lascrb11/pedagogicalPlanner.do' WHERE tool_signature='lascrb11';
-
-----------------------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/lascrb11/pedagogicalPlanner.do' WHERE tool_signature='lascrb11';
+
+----------------------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_spreadsheet/db/model/spreadsheet.clay
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_spreadsheet/db/model/spreadsheet.clay (.../spreadsheet.clay) (revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/db/model/spreadsheet.clay (.../spreadsheet.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,590 +1,590 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_survey/db/model/survey.clay
===================================================================
diff -u -r7b79396263b36a933d66390fb9ab12821956d59d -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_survey/db/model/survey.clay (.../survey.clay) (revision 7b79396263b36a933d66390fb9ab12821956d59d)
+++ lams_tool_survey/db/model/survey.clay (.../survey.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,917 +1,917 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql
===================================================================
diff -u -r59550921a627a4ca6f9b83cdff15082656c140b1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql (.../patch20081021_updateFrom21.sql) (revision 59550921a627a4ca6f9b83cdff15082656c140b1)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql (.../patch20081021_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,35 +1,35 @@
--- 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_lasurv11_conditions (
- condition_id BIGINT(20) NOT NULL
- , content_uid BIGINT(20)
- , PRIMARY KEY (condition_id)
- , CONSTRAINT SurveyConditionInheritance FOREIGN KEY (condition_id)
- REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT SurveyConditionToSurvey FOREIGN KEY (content_uid)
- REFERENCES tl_lasurv11_survey(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-CREATE TABLE tl_lasurv11_condition_questions (
- condition_id BIGINT(20)
- , question_uid BIGINT(20)
- , PRIMARY KEY (condition_id,question_uid)
- , CONSTRAINT SurveyConditionQuestionToSurveyCondition FOREIGN KEY (condition_id)
- REFERENCES tl_lasurv11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
- , CONSTRAINT SurveyConditionQuestionToSurveyQuestion FOREIGN KEY (question_uid)
- REFERENCES tl_lasurv11_question(uid) ON DELETE CASCADE ON UPDATE CASCADE
-)TYPE=InnoDB;
-
-UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lasurv11';
-
-ALTER TABLE tl_lasurv11_survey ADD COLUMN answer_submit_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_lasurv11_conditions (
+ condition_id BIGINT(20) NOT NULL
+ , content_uid BIGINT(20)
+ , PRIMARY KEY (condition_id)
+ , CONSTRAINT SurveyConditionInheritance FOREIGN KEY (condition_id)
+ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT SurveyConditionToSurvey FOREIGN KEY (content_uid)
+ REFERENCES tl_lasurv11_survey(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE tl_lasurv11_condition_questions (
+ condition_id BIGINT(20)
+ , question_uid BIGINT(20)
+ , PRIMARY KEY (condition_id,question_uid)
+ , CONSTRAINT SurveyConditionQuestionToSurveyCondition FOREIGN KEY (condition_id)
+ REFERENCES tl_lasurv11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+ , CONSTRAINT SurveyConditionQuestionToSurveyQuestion FOREIGN KEY (question_uid)
+ REFERENCES tl_lasurv11_question(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lasurv11';
+
+ALTER TABLE tl_lasurv11_survey ADD COLUMN answer_submit_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_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20090113_updateFrom22.sql
===================================================================
diff -u -r3636757b4afafb785ae0c6c8295a969c605f8e28 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20090113_updateFrom22.sql (.../patch20090113_updateFrom22.sql) (revision 3636757b4afafb785ae0c6c8295a969c605f8e28)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20090113_updateFrom22.sql (.../patch20090113_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/latask10/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='latask10';
-
-----------------------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/latask10/authoring/initPedagogicalPlannerForm.do' WHERE tool_signature='latask10';
+
+----------------------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_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20081203_updateFrom22.sql
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20081203_updateFrom22.sql (.../patch20081203_updateFrom22.sql) (revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20081203_updateFrom22.sql (.../patch20081203_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -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/lavote11/pedagogicalPlanner.do' WHERE tool_signature='lavote11';
-
-----------------------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/lavote11/pedagogicalPlanner.do' WHERE tool_signature='lavote11';
+
+----------------------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_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql
===================================================================
diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
@@ -1,39 +1,39 @@
--- 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/lawiki10/pedagogicalPlanner.do' WHERE tool_signature='lawiki10';
-
-SET FOREIGN_KEY_CHECKS=0;
-drop table if exists tl_lawiki10_wiki_page_temp;
-create table tl_lawiki10_wiki_page_temp (
- uid bigint not null auto_increment,
- wiki_uid bigint,
- title varchar(255),
- editable bit,
- wiki_current_content bigint,
- added_by bigint,
- wiki_session_uid bigint,
- primary key (uid),
- unique key wiki_unique_key (wiki_uid, title, wiki_session_uid)
-)TYPE=InnoDB;
-
-INSERT INTO tl_lawiki10_wiki_page_temp SELECT * from tl_lawiki10_wiki_page;
-drop table if exists tl_lawiki10_wiki_page;
-COMMIT;
-rename table tl_lawiki10_wiki_page_temp to tl_lawiki10_wiki_page;
-alter table tl_lawiki10_wiki_page add index wiki_page_index_1 (wiki_session_uid), add constraint wiki_page_fk_1 foreign key (wiki_session_uid) references tl_lawiki10_session (uid);
-alter table tl_lawiki10_wiki_page add index wiki_page_index_2 (wiki_uid), add constraint wiki_page_fk_2 foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
-alter table tl_lawiki10_wiki_page add index wiki_page_index_3 (added_by), add constraint wiki_page_fk_3 foreign key (added_by) references tl_lawiki10_user (uid);
-alter table tl_lawiki10_wiki_page add index wiki_page_index_4 (wiki_current_content), add constraint wiki_page_fk_4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid);
-
-SET FOREIGN_KEY_CHECKS=1;
-
-----------------------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/lawiki10/pedagogicalPlanner.do' WHERE tool_signature='lawiki10';
+
+SET FOREIGN_KEY_CHECKS=0;
+drop table if exists tl_lawiki10_wiki_page_temp;
+create table tl_lawiki10_wiki_page_temp (
+ uid bigint not null auto_increment,
+ wiki_uid bigint,
+ title varchar(255),
+ editable bit,
+ wiki_current_content bigint,
+ added_by bigint,
+ wiki_session_uid bigint,
+ primary key (uid),
+ unique key wiki_unique_key (wiki_uid, title, wiki_session_uid)
+)TYPE=InnoDB;
+
+INSERT INTO tl_lawiki10_wiki_page_temp SELECT * from tl_lawiki10_wiki_page;
+drop table if exists tl_lawiki10_wiki_page;
+COMMIT;
+rename table tl_lawiki10_wiki_page_temp to tl_lawiki10_wiki_page;
+alter table tl_lawiki10_wiki_page add index wiki_page_index_1 (wiki_session_uid), add constraint wiki_page_fk_1 foreign key (wiki_session_uid) references tl_lawiki10_session (uid);
+alter table tl_lawiki10_wiki_page add index wiki_page_index_2 (wiki_uid), add constraint wiki_page_fk_2 foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
+alter table tl_lawiki10_wiki_page add index wiki_page_index_3 (added_by), add constraint wiki_page_fk_3 foreign key (added_by) references tl_lawiki10_user (uid);
+alter table tl_lawiki10_wiki_page add index wiki_page_index_4 (wiki_current_content), add constraint wiki_page_fk_4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid);
+
+SET FOREIGN_KEY_CHECKS=1;
+
+----------------------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