Index: lams_common/db/sql/create_sharedlesson_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/create_sharedlesson_tables.sql,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_common/db/sql/create_sharedlesson_tables.sql 4 Jul 2007 06:10:24 -0000 1.1.2.4 +++ lams_common/db/sql/create_sharedlesson_tables.sql 29 Aug 2007 06:40:48 -0000 1.1.2.5 @@ -35,6 +35,7 @@ `org_id` bigint(20) NOT NULL, `ext_lesson_id` bigint(20) NOT NULL, `ext_lesson_name` varchar(255) NOT NULL, + `ext_lesson_description` text, `lesson_state_id` int(3) NOT NULL, PRIMARY KEY (`sid`) ) TYPE=InnoDB; Index: lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/Attic/LessonFederation.java,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java 29 Aug 2007 04:44:24 -0000 1.1.2.4 +++ lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java 29 Aug 2007 06:40:48 -0000 1.1.2.5 @@ -33,18 +33,22 @@ private String extLessonName; /** persistent field */ + private String extLessonDescription; + + /** persistent field */ private Integer lessonStateId; /** default constructor */ public LessonFederation() { } /** full constructor */ - public LessonFederation(FederationServer fedServer, Organisation org, Long extLessonId, String extLessonName, Integer lessonStateId) { + public LessonFederation(FederationServer fedServer, Organisation org, Long extLessonId, String extLessonName, String extLessonDescription, Integer lessonStateId) { this.fedServer = fedServer; this.org = org; this.extLessonId = extLessonId; this.extLessonName = extLessonName; + this.extLessonDescription = extLessonDescription; this.lessonStateId = lessonStateId; } @@ -53,6 +57,7 @@ +"orgId: "+org.getOrganisationId() +"extLessonId: "+extLessonId +"extLessonName: "+extLessonName + +"extLessonDescription: "+extLessonDescription +"lessonStateId: "+lessonStateId; } @@ -128,6 +133,19 @@ /** * @hibernate.property + * column="ext_lesson_description" + * length="65535" + */ + public String getExtLessonDescription() { + return extLessonDescription; + } + + public void setExtLessonDescription(String extLessonDescription) { + this.extLessonDescription = extLessonDescription; + } + + /** + * @hibernate.property * column="lesson_state_id" * length="3" * not-null="true" Index: lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/service/Attic/FederationService.java,v diff -u -r1.1.2.17 -r1.1.2.18 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 29 Aug 2007 03:32:01 -0000 1.1.2.17 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 29 Aug 2007 06:40:48 -0000 1.1.2.18 @@ -507,13 +507,15 @@ // lesson id Long extLessonId = WDDXProcessor.convertToLong("extLessonId", table.get("extLessonId")); String extLessonName = WDDXProcessor.convertToString("extLessonName", table.get("extLessonName")); + String extLessonDescription = WDDXProcessor.convertToString("extLessonDescription", table.get("extLessonDescription")); Integer fedId = WDDXProcessor.convertToInteger("fedId", table.get("fedId")); Integer orgId = WDDXProcessor.convertToInteger("orgId", table.get("orgId")); FederationServer fedServer = getFedServerByFedId(fedId); Organisation org = (Organisation)getService().findById(Organisation.class, orgId); if (fedServer != null && org != null) { - LessonFederation lessonFed = new LessonFederation(fedServer, org, extLessonId, extLessonName, Lesson.STARTED_STATE); + LessonFederation lessonFed = new LessonFederation(fedServer, + org, extLessonId, extLessonName, extLessonDescription, Lesson.STARTED_STATE); log.debug("Saving LessonFederation: "+lessonFed); getService().save(lessonFed); }