Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUploadedFile.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 6 Jun 2006 07:12:18 -0000 1.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 6 Jun 2006 16:06:07 -0000 1.9 @@ -24,7 +24,6 @@ import java.io.Serializable; -import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -68,7 +67,6 @@ /** persistent field */ private QaContent qaContent; - public QaUploadedFile(){}; /** full constructor */ @@ -220,20 +218,4 @@ else return (int) (submissionId.longValue() - file.submissionId.longValue()); } - - public String getFileProperty() { - if (isFileOnline()) - { - return IToolContentHandler.TYPE_ONLINE; - } - else - return IToolContentHandler.TYPE_OFFLINE; - } - - public void setFileProperty(String fileProperty) { - if(StringUtils.equals(IToolContentHandler.TYPE_ONLINE,fileProperty)) - this.fileOnline = true; - else - this.fileOnline = false; - } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v diff -u -r1.17 -r1.18 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 6 Jun 2006 07:12:18 -0000 1.17 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 6 Jun 2006 16:06:07 -0000 1.18 @@ -81,7 +81,6 @@ - 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.55 -r1.56 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 6 Jun 2006 07:12:18 -0000 1.55 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 6 Jun 2006 16:06:07 -0000 1.56 @@ -26,7 +26,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.TreeSet; import org.apache.log4j.Logger; @@ -45,9 +44,6 @@ import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; -import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; -import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; -import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; @@ -121,8 +117,7 @@ private ILamsToolService toolService; private ILearnerService learnerService; private IAuditService auditService; - private IExportToolContentService exportContentService; - + public void configureContentRepository() throws QaApplicationException { logger.debug("retrieved repService: " + repositoryService); cred = new SimpleCredentials(repositoryUser, repositoryId); @@ -858,7 +853,7 @@ */ public boolean studentActivityOccurredGlobal(QaContent qaContent) throws QaApplicationException { - logger.debug("using qaContent: " + qaContent); + logger.debug("doing studentActivityOccurredGlobal : " + qaContent); Iterator questionIterator=qaContent.getQaQueContents().iterator(); while (questionIterator.hasNext()) { @@ -1314,73 +1309,21 @@ * @throws ToolException if any other error occurs */ - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { - QaContent toolContentObj = qaDAO.getQaById(toolContentId); - if(toolContentObj == null) - throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); - - try { - //set ResourceToolContentHandler as null to avoid copy file node in repository again. - toolContentObj = QaContent.newInstance(qaToolContentHandler,toolContentObj,toolContentId); - - //don't export following fields value - toolContentObj.setQaSessions(null); - Set questions = toolContentObj.getQaQueContents(); - for(QaQueContent question : questions){ - question.setQaQueUsers(null); - question.setQaContent(null); - question.setQaUsrResps(null); - question.setUserResponses(null); - } - Set files = toolContentObj.getQaUploadedFiles(); - for(QaUploadedFile file : files){ - file.setQaContent(null); - } - - exportContentService.registerFileClassForExport(QaUploadedFile.class.getName(),"uuid",null); - exportContentService.exportToolContent( toolContentId, toolContentObj,qaToolContentHandler, rootPath); - } catch (ExportToolContentException e) { - throw new ToolException(e); - } catch (ItemNotFoundException e) { - throw new ToolException(e); - } catch (RepositoryCheckedException e) { - throw new ToolException(e); - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } /** * Import the XML fragment for the tool's content, along with any files needed * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { - try { - exportContentService.registerFileClassForImport(QaUploadedFile.class.getName(),"uuid",null,"fileName","fileProperty",null,null); - - Object toolPOJO = exportContentService.importToolContent(toolContentPath,qaToolContentHandler); - if(!(toolPOJO instanceof QaContent)) - throw new ImportToolContentException("Import QA tool content failed. Deserialized object is " + toolPOJO); - QaContent toolContentObj = (QaContent) toolPOJO; - -// reset it to new toolContentId - toolContentObj.setQaContentId(toolContentId); - toolContentObj.setCreatedBy(newUserUid); - - //set back the tool content - Set questions = toolContentObj.getQaQueContents(); - for(QaQueContent question : questions){ - question.setQaContent(toolContentObj); - } - Set files = toolContentObj.getQaUploadedFiles(); - for(QaUploadedFile file : files){ - file.setQaContent(toolContentObj); - } - qaDAO.saveOrUpdateQa(toolContentObj); - } catch (ImportToolContentException e) { - throw new ToolException(e); - } + public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + } + public void importToolContent(String toolContentPath) throws ToolException { + } + /** * it is possible that the tool session id already exists in the tool sessions table * as the users from the same session are involved. @@ -1933,16 +1876,6 @@ public void setAuditService(IAuditService auditService) { this.auditService = auditService; } - - - public IExportToolContentService getExportContentService() { - return exportContentService; - } - - - public void setExportContentService(IExportToolContentService exportContentService) { - this.exportContentService = exportContentService; - } }