Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java,v diff -u -r1.15 -r1.15.4.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java 20 Sep 2006 15:15:44 -0000 1.15 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java 19 Feb 2009 03:07:16 -0000 1.15.4.1 @@ -29,33 +29,29 @@ import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; - /** * * @author Ozgur Demirtas - * + * */ -public interface IQaQueUsrDAO -{ - public QaQueUsr getQaUserByUID(Long uid); - +public interface IQaQueUsrDAO { + public QaQueUsr getQaUserByUID(Long uid); + public QaQueUsr getQaQueUsrById(long qaQueUsrId); - + public QaQueUsr loadQaQueUsrById(long qaQueUsrId); - + public QaQueUsr getQaUserBySession(final Long queUsrId, final Long qaSessionId); - + public void createUsr(QaQueUsr usr); - + public void updateUsr(QaQueUsr usr); - + public void deleteQaQueUsr(QaQueUsr qaQueUsr); - + public int countSessionUser(QaSession qaSession); - - public int getTotalNumberOfUsers(); - + public int getTotalNumberOfUsers(QaContent qa); - + public List getUserBySessionOnly(final QaSession qaSession); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/Attic/IQaUploadedFileDAO.java,v diff -u -r1.10 -r1.10.4.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java 20 Sep 2006 15:15:44 -0000 1.10 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java 19 Feb 2009 03:07:16 -0000 1.10.4.1 @@ -32,27 +32,24 @@ /** * * @author Ozgur Demirtas - * + * */ -public interface IQaUploadedFileDAO -{ - public QaUploadedFile loadUploadedFileById(long submissionId); +public interface IQaUploadedFileDAO { + public QaUploadedFile loadUploadedFileById(long submissionId); - public void updateUploadFile(QaUploadedFile qaUploadedFile); - - public void saveUploadFile(QaUploadedFile qaUploadedFile); - - public void createUploadFile(QaUploadedFile qaUploadedFile); - - public void UpdateUploadFile(QaUploadedFile qaUploadedFile); + public void updateUploadFile(QaUploadedFile qaUploadedFile); - public void removeUploadFile(Long submissionId); - - public void deleteUploadFile(QaUploadedFile qaUploadedFile); - - public List retrieveQaUploadedFiles(QaContent qa); - - public void cleanUploadedFilesMetaData(); - - public void flush(); + public void saveUploadFile(QaUploadedFile qaUploadedFile); + + public void createUploadFile(QaUploadedFile qaUploadedFile); + + public void UpdateUploadFile(QaUploadedFile qaUploadedFile); + + public void removeUploadFile(Long submissionId); + + public void deleteUploadFile(QaUploadedFile qaUploadedFile); + + public List retrieveQaUploadedFiles(QaContent qa); + + public void flush(); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v diff -u -r1.18.4.1 -r1.18.4.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 19 Feb 2009 00:57:01 -0000 1.18.4.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 19 Feb 2009 03:07:16 -0000 1.18.4.2 @@ -48,6 +48,11 @@ private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSessionId= :qaSession"; private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where qaQueUsr.qaSessionId= :qaSessionId"; + private static final String GET_USER_COUNT_FOR_CONTENT = "select count(*) from QaQueUsr quser, QaSession qses, QaQueContent qcon where " + + "quser.qaSession=qses and " + "qses.qaContent=qcon and " + "qcon.uid=:uid"; + + // select count(*) from tl_laqa11_que_usr quser, tl_laqa11_session qses where quser.qa_session_id=qses.uid and qses.qa_content_id=5378; + public QaQueUsr getQaUserByUID(Long uid) { return (QaQueUsr) this.getHibernateTemplate().get(QaQueUsr.class, uid); } @@ -109,12 +114,20 @@ this.getHibernateTemplate().delete(qaQueUsr); } - public int getTotalNumberOfUsers() { - String query = "from obj in class QaQueUsr"; - return this.getHibernateTemplate().find(query).size(); - } - public int getTotalNumberOfUsers(QaContent qa) { + + int returnInt = 0; + if (qa != null && qa.getUid() != null) { + List result = getSession().createQuery(GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()).list(); + Integer resultInt = (result.get(0) != null) ? (Integer) result.get(0) : new Integer(0); + returnInt = resultInt.intValue(); + } else { + logger.error("Attempt to count users from null content"); + } + logger.debug("Number of users for quContent " +qa.getUid()+ ": " + returnInt); + return returnInt; + + /* String strGetUser = "from qaQueUsr in class QaQueUsr"; HibernateTemplate templ = this.getHibernateTemplate(); List list = getSession().createQuery(strGetUser).list(); @@ -135,6 +148,7 @@ } logger.debug("final totalUserCount: " + totalUserCount); return totalUserCount; + */ } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/QaUploadedFileDAO.java,v diff -u -r1.12.4.1 -r1.12.4.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java 19 Feb 2009 00:57:01 -0000 1.12.4.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java 19 Feb 2009 03:07:16 -0000 1.12.4.2 @@ -46,8 +46,6 @@ private static final String GET_UPLOADED_FILES = "from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContent.qaContentId = :contentId"; - private static final String DELETE_FILES_META_DATA = "from qaUploadedFile in class QaUploadedFile"; - public QaUploadedFile getUploadedFileById(long submissionId) { return (QaUploadedFile) this.getHibernateTemplate().load(QaUploadedFile.class, new Long(submissionId)); } @@ -80,26 +78,6 @@ this.getHibernateTemplate().update(qaUploadedFile); } - public void cleanUploadedFilesMetaData() { - /* - String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile"; - this.getSession().setFlushMode(FlushMode.AUTO); - this.getHibernateTemplate().delete(query); - */ - HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(DELETE_FILES_META_DATA).list(); - - if (list != null && list.size() > 0) { - Iterator listIterator = list.iterator(); - while (listIterator.hasNext()) { - QaUploadedFile mcFile = (QaUploadedFile) listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); - templ.delete(mcFile); - templ.flush(); - } - } - } - public void removeUploadFile(Long submissionId) { if (submissionId != null) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.51 -r1.51.2.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 4 Nov 2008 05:10:34 -0000 1.51 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 19 Feb 2009 03:07:16 -0000 1.51.2.1 @@ -76,8 +76,6 @@ public QaContent getQaContentByUID(Long uid) throws QaApplicationException; - public int getTotalNumberOfUsers() throws QaApplicationException; - public int getTotalNumberOfUsers(QaContent qa) throws QaApplicationException; public int countSessionComplete(QaContent qa) throws QaApplicationException; @@ -268,8 +266,6 @@ public List retrieveQaUploadedFiles(QaContent qa) throws QaApplicationException; - public void cleanUploadedFilesMetaData() throws QaApplicationException; - public List retrieveQaQueContentsByToolContentId(long toolContentId); public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.83 -r1.83.2.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 4 Nov 2008 05:10:34 -0000 1.83 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 19 Feb 2009 03:07:16 -0000 1.83.2.1 @@ -580,15 +580,6 @@ } } - public int getTotalNumberOfUsers() throws QaApplicationException { - try { - return qaQueUsrDAO.getTotalNumberOfUsers(); - } catch (DataAccessException e) { - throw new QaApplicationException("Exception occured when lams is retrieving total number of QaQueUsr: " - + e.getMessage(), e); - } - } - public int countTotalNumberOfUserResponsed(QaContent qa) throws QaApplicationException { try { return qaDAO.countUserResponsed(qa); @@ -1502,15 +1493,6 @@ QaServicePOJO.logger.debug("removed qaUploadedFile: " + submissionId); } - /** - * removes all the entries in the uploaded files table - */ - public void cleanUploadedFilesMetaData() throws QaApplicationException { - QaServicePOJO.logger.debug("attempt cleaning up uploaded file meta data table from the db"); - qaUploadedFileDAO.cleanUploadedFilesMetaData(); - QaServicePOJO.logger.debug("files meta data has been cleaned up"); - } - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { QaServicePOJO.logger.debug("coreNotebookService: " + coreNotebookService); return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);