Index: lams_webct_integration/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_webct_integration/build.xml,v diff -u -r1.9 -r1.10 --- lams_webct_integration/build.xml 8 Feb 2008 04:16:52 -0000 1.9 +++ lams_webct_integration/build.xml 23 Apr 2008 04:13:41 -0000 1.10 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_webct_integration/db/sql/createTable_Oracle.sql,v diff -u Binary files differ Index: lams_webct_integration/db/sql/deleteTable_Oracle.sql =================================================================== RCS file: /usr/local/cvsroot/lams_webct_integration/db/sql/deleteTable_Oracle.sql,v diff -u Binary files differ Index: lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java =================================================================== RCS file: /usr/local/cvsroot/lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java,v diff -u -r1.9 -r1.10 --- lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java 8 Feb 2008 04:17:13 -0000 1.9 +++ lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java 23 Apr 2008 04:13:41 -0000 1.10 @@ -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"), '\'', "\\'"));