Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/model/lams_tool_qa.clay,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/db/model/lams_tool_qa.clay 14 Feb 2006 18:03:11 -0000 1.10
+++ lams_tool_laqa/db/model/lams_tool_qa.clay 14 Feb 2006 18:40:42 -0000 1.11
@@ -341,13 +341,26 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -392,7 +405,7 @@
-
+
@@ -408,7 +421,7 @@
-
+
@@ -489,19 +502,19 @@
-
+
-
+
-
+
-
+
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql 14 Feb 2006 18:03:11 -0000 1.18
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql 14 Feb 2006 18:40:42 -0000 1.19
@@ -45,11 +45,12 @@
)TYPE=InnoDB;
CREATE TABLE lams.tl_laqa11_que_content (
- qa_que_content_id BIGINT(20) NOT NULL
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , qa_que_content_id BIGINT(20) NOT NULL
, question VARCHAR(255)
, display_order INT(5)
, qa_content_id BIGINT(20) NOT NULL
- , PRIMARY KEY (qa_que_content_id)
+ , PRIMARY KEY (uid)
, INDEX (qa_content_id)
, CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id)
REFERENCES lams.tl_laqa11_content (uid)
@@ -64,12 +65,12 @@
, que_usr_id BIGINT(20) NOT NULL
, qa_que_content_id BIGINT(20) NOT NULL
, PRIMARY KEY (response_id)
- , INDEX (qa_que_content_id)
- , CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (qa_que_content_id)
- REFERENCES lams.tl_laqa11_que_content (qa_que_content_id)
, INDEX (que_usr_id)
, CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (que_usr_id)
REFERENCES lams.tl_laqa11_que_usr (uid)
+ , INDEX (qa_que_content_id)
+ , CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (qa_que_content_id)
+ REFERENCES lams.tl_laqa11_que_content (uid)
)TYPE=InnoDB;
CREATE TABLE lams.tl_laqa11_uploadedfile (
@@ -84,9 +85,8 @@
REFERENCES lams.tl_laqa11_content (uid)
)TYPE=InnoDB;
-
-- data for content table
INSERT INTO tl_laqa11_content (qa_content_id, creation_date) VALUES (${default_content_id}, NOW());
-- data for content questions table
-INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
\ No newline at end of file
+INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the capital of Russia?',1,${default_content_id});
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java 11 Nov 2005 10:27:14 -0000 1.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java 14 Feb 2006 18:40:42 -0000 1.5
@@ -49,6 +49,9 @@
{
static Logger logger = Logger.getLogger(QaQueContent.class.getName());
+ /** identifier field */
+ private Long uid;
+
/** identifier field */
private Long qaQueContentId;
@@ -355,4 +358,16 @@
public void setQaContentId(Long qaContentId) {
this.qaContentId = qaContentId;
}
+ /**
+ * @return Returns the uid.
+ */
+ public Long getUid() {
+ return uid;
+ }
+ /**
+ * @param uid The uid to set.
+ */
+ public void setUid(Long uid) {
+ this.uid = uid;
+ }
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/QaQueContentDAO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java 5 Jan 2006 04:33:27 -0000 1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java 14 Feb 2006 18:40:42 -0000 1.11
@@ -33,6 +33,7 @@
import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.dao.IQaQueContentDAO;
import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateTemplate;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -62,7 +63,24 @@
}
});
}
+
+ public QaQueContent getQaQueById(long qaQueContentId)
+ {
+ String query = "from QaQueContent as qu where qu.qaQueContentId = ?";
+ HibernateTemplate templ = this.getHibernateTemplate();
+ List list = getSession().createQuery(query)
+ .setLong(0,qaQueContentId)
+ .list();
+
+ if(list != null && list.size() > 0){
+ QaQueContent qa = (QaQueContent) list.get(0);
+ return qa;
+ }
+ return null;
+ }
+
+
public List getQuestionIndsForContent(QaContent qa)
{
@@ -73,11 +91,12 @@
return listDefaultQuestionIds;
}
-
+ /*
public QaQueContent getQaQueById(long qaQueContentId)
{
return (QaQueContent) this.getHibernateTemplate().load(QaQueContent.class, new Long(qaQueContentId));
}
+ */
public void createQueContent(QaQueContent queContent)
{