Index: lams_tool_lamc/db/sql/init_lams_tool_lamc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/init_lams_tool_lamc.sql,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/insert_lams_tool_lamc.sql,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 26 Oct 2005 15:50:36 -0000 1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 27 Oct 2005 07:39:47 -0000 1.17
@@ -22,6 +22,7 @@
package org.lamsfoundation.lams.tool.mc.dao.hibernate;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import org.apache.log4j.Logger;
@@ -44,13 +45,13 @@
public class McQueContentDAO extends HibernateDaoSupport implements IMcQueContentDAO {
static Logger logger = Logger.getLogger(McQueContentDAO.class.getName());
- private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId orderby displayOrder";
+ private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId order by mcQueContent.displayOrder";
private static final String CLEAN_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId and mcQueContent.disabled=true";
private static final String REFRESH_QUESTION_CONTENT = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId and mcQueContent.disabled=false";
- private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question and mcQueContent.mcContentId=:mcContentUid orderby displayOrder";
+ private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question and mcQueContent.mcContentId=:mcContentUid";
public McQueContent getMcQueContentByUID(Long uid)
@@ -80,8 +81,8 @@
List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID)
.setLong("mcContentId", mcContentId)
.list();
-
- return list;
+
+ return list;
}
public List refreshQuestionContent(final Long mcContentId)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.21 -r1.22
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 26 Oct 2005 15:50:35 -0000 1.21
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 27 Oct 2005 07:39:47 -0000 1.22
@@ -663,8 +663,32 @@
isRetries=true;
logger.debug("passmark: " + mcAuthoringForm.getPassmark());
- if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0))
+
+ if (mcAuthoringForm.getPassmark() != null)
+ {
+ try
+ {
+ passmark= new Integer(mcAuthoringForm.getPassmark()).intValue();
+ logger.debug("tried passmark: " + passmark);
+ }
+ catch(Exception e)
+ {
+ errors= new ActionMessages();
+ errors.add(Globals.ERROR_KEY,new ActionMessage("error.passmark.notInteger"));
+ logger.debug("add error.passmark.notInteger to ActionMessages");
+ saveErrors(request,errors);
+ mcAuthoringForm.resetUserAction();
+ persistError(request,"error.passmark.notInteger");
+ return (mapping.findForward(LOAD_QUESTIONS));
+ }
+ }
+
+
+ if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0))
+ {
passmark= new Integer(mcAuthoringForm.getPassmark()).intValue();
+ logger.debug("populated passmark: " + passmark);
+ }
else
{
errors= new ActionMessages();
@@ -676,19 +700,6 @@
return (mapping.findForward(LOAD_QUESTIONS));
}
-
- try
- {
- passmark= new Integer(mcAuthoringForm.getPassmark()).intValue();
-
- }
- catch(Exception e)
- {
- logger.debug("Exception occured: passmark not integer");
- persistError(request,"error.passmark.notInteger");
- return (mapping.findForward(LOAD_QUESTIONS));
- }
-
logger.debug("isShowFeedback: " + mcAuthoringForm.getShowFeedback());
if (mcAuthoringForm.getShowFeedback().equalsIgnoreCase(ON))
isShowFeedback=true;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.12 -r1.13
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 26 Oct 2005 15:50:35 -0000 1.12
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 27 Oct 2005 07:39:47 -0000 1.13
@@ -192,7 +192,7 @@
long queContentUID=0;
try
{
- logger.debug("retrieve the default question content based on default content UID: " + contentId);
+ logger.debug("retrieve the default question content based on default content UID: " + queContentUID);
McQueContent mcQueContent=mcService.getToolDefaultQuestionContent(contentUID);
logger.debug("using mcQueContent: " + mcQueContent);
if (mcQueContent == null)
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/authoringMaincontent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_lamc/web/authoringMaincontent.jsp 26 Oct 2005 15:50:35 -0000 1.20
+++ lams_tool_lamc/web/authoringMaincontent.jsp 27 Oct 2005 07:39:47 -0000 1.21
@@ -124,9 +124,9 @@
- |
+ |
|
- |