Index: lams_webct_integration/build.xml =================================================================== diff -u -r14d46b3314d205f74c8e8752c84e44b74219c9cd -r36871a1b28024c7466fd97296490bc95dfc5ead0 --- lams_webct_integration/build.xml (.../build.xml) (revision 14d46b3314d205f74c8e8752c84e44b74219c9cd) +++ lams_webct_integration/build.xml (.../build.xml) (revision 36871a1b28024c7466fd97296490bc95dfc5ead0) @@ -226,6 +226,7 @@ userid="${dbUser}" password="${dbPass}" encoding="utf8" + onerror="continue" > @@ -239,6 +240,7 @@ userid="${dbUser}" password="${dbPass}" encoding="utf8" + onerror="continue" > Index: lams_webct_integration/db/sql/createTable_Oracle.sql =================================================================== diff -u --- lams_webct_integration/db/sql/createTable_Oracle.sql (revision 0) +++ lams_webct_integration/db/sql/createTable_Oracle.sql (revision 36871a1b28024c7466fd97296490bc95dfc5ead0) @@ -0,0 +1,40 @@ +DROP TABLE webct_lams_lesson; +CREATE TABLE webct_lams_lesson +( + id NUMBER NOT NULL, + pt_id NUMBER NOT NULL, + lesson_id NUMBER NOT NULL, + learning_context_id NUMBER NOT NULL, + sequence_id NUMBER, + owner_id VARCHAR2 (255), + owner_first_name VARCHAR2 (255), + owner_last_name VARCHAR2 (255), + title VARCHAR2 (255) NOT NULL, + description VARCHAR2(4000), + hidden NUMBER DEFAULT 0, + schedule NUMBER DEFAULT 0, + start_date_time TIMESTAMP , + end_date_time TIMESTAMP , + CONSTRAINT pk_webct_lams_lesson_id PRIMARY KEY (id), + CONSTRAINT uk_webct_lams_lesson_lesson_id UNIQUE(lesson_id) +); + +DROP INDEX webct_lams_lesson_lesson_id; +CREATE UNIQUE INDEX webct_lams_lesson_lesson_id ON webct_lams_lesson (lesson_id, pt_id); + +DROP SEQUENCE webct_lams_lesson_sequence; +CREATE SEQUENCE webct_lams_lesson_sequence +START WITH 1 +INCREMENT BY 1; + +DROP TRIGGER webct_lams_lesson_trigger; +CREATE TRIGGER webct_lams_lesson_trigger +BEFORE INSERT +ON webct_lams_lesson +REFERENCING NEW AS NEW +FOR EACH ROW +BEGIN +SELECT webct_lams_lesson_sequence.nextval INTO :NEW.ID FROM dual; +END; +/ +COMMIT; \ No newline at end of file Index: lams_webct_integration/db/sql/deleteTable_Oracle.sql =================================================================== diff -u --- lams_webct_integration/db/sql/deleteTable_Oracle.sql (revision 0) +++ lams_webct_integration/db/sql/deleteTable_Oracle.sql (revision 36871a1b28024c7466fd97296490bc95dfc5ead0) @@ -0,0 +1 @@ \ No newline at end of file Index: lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java =================================================================== diff -u -r14d46b3314d205f74c8e8752c84e44b74219c9cd -r36871a1b28024c7466fd97296490bc95dfc5ead0 --- lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java (.../LamsModule.java) (revision 14d46b3314d205f74c8e8752c84e44b74219c9cd) +++ lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java (.../LamsModule.java) (revision 36871a1b28024c7466fd97296490bc95dfc5ead0) @@ -55,6 +55,7 @@ import org.lamsfoundation.integration.webct.LamsSecurityUtil; import org.lamsfoundation.integration.dao.ILamsLessonDao; +import org.lamsfoundation.integration.dao.LamsLessonDaoJDBC; import org.lamsfoundation.integration.dao.LamsLessonDaoMySqlJDBC; import org.lamsfoundation.integration.util.Constants; @@ -213,7 +214,8 @@ // generate teacher page // ie list of running lessons, and a create new lesson button try{ - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); List lessons = lessonDao.getDBLessons(lcID.longValue(), Long.parseLong(ptid)); monitorUrl = generateRequestURL(user, lcID, "monitor"); @@ -237,8 +239,8 @@ // generate student page // ie list of running lessons try{ - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); - + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); // test //List lessons = lessonDao.getDBLessons(1); @@ -341,8 +343,8 @@ String successMessage="LAMS lesson deleted."; String lsID = request.getParameter("lsID"); - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); - + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); boolean success = lessonDao.deleteDbLesson(Long.parseLong(lsID)); if (!success) @@ -418,8 +420,9 @@ } - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); - LamsLesson lesson = new LamsLesson( + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); + LamsLesson lesson = new LamsLesson( lsID, Long.parseLong(ptid), lcID.longValue(), @@ -507,8 +510,9 @@ else if(action.equals("modify_lesson")) { try{ - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); - LamsLesson modLesson = lessonDao.getDBLesson(request.getParameter("lsID")); + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); + LamsLesson modLesson = lessonDao.getDBLesson(request.getParameter("lsID")); params.put("lsID", request.getParameter("lsID")); @@ -653,9 +657,9 @@ } else if(action.equals("modify_proc")) { - ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + //ILamsLessonDao lessonDao = new LamsLessonDaoMySqlJDBC(settings); + ILamsLessonDao lessonDao = new LamsLessonDaoJDBC(settings); - try{ LamsLesson modLesson = lessonDao.getDBLesson(request.getParameter("lsID")); modLesson.setTitle(LamsSecurityUtil.replace(request.getParameter("title"), '\'', "\\'"));