Index: lams_central/web/toolcontent/learning-design-ims.xslt
===================================================================
diff -u -re23e3efb1b812146c7fbd114f16ebac155b1b327 -r13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9
--- lams_central/web/toolcontent/learning-design-ims.xslt (.../learning-design-ims.xslt) (revision e23e3efb1b812146c7fbd114f16ebac155b1b327)
+++ lams_central/web/toolcontent/learning-design-ims.xslt (.../learning-design-ims.xslt) (revision 13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9)
@@ -169,7 +169,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -272,6 +280,11 @@
+
+ S-PARALLELOPTIONSSEQUENCE-
+
+
+
E--
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r9fb723549f70ebaa38ae725aef0493749da4f2f6 -r13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 9fb723549f70ebaa38ae725aef0493749da4f2f6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 13f0dddac4d08db5b537bfa8d8d8fd91e25c9fe9)
@@ -173,6 +173,7 @@
private static final String IMS_PREFIX_RESOURCE_IDENTIFIER = "R-";
private static final String IMS_PREFIX_ACTIVITY_REF = "A-";
+ private static final String IMS_PREFIX_COMPLEX_REF = "S-";
//this is not IMS standard tag, temporarily use to gather all tools node list
private static final String IMS_TAG_TRANSITIONS = "transitions";
@@ -181,6 +182,10 @@
private static final String IMS_TAG_GROUPING = "group";
private static final String IMS_TAG_GATE = "gate";
+ private static final String IMS_TAG_OPTIONAL = "OPTIONS";
+ private static final String IMS_TAG_PARALLEL = "PARALLEL";
+ private static final String IMS_TAG_SEQUENCE = "SEQUENCE";
+
//temporarily file for IMS XSLT file
private static final String XSLT_PARAM_RESOURCE_FILE = "resourcesFile";
private static final String IMS_RESOURCES_FILE_NAME = "resources.xml";
@@ -548,10 +553,6 @@
AuthoringActivityDTO activityDTO = iter.next();
if(activityDTO.getParentActivityID() != null)
iter.remove();
- if(activityDTO.getActivityTypeID() == Activity.SEQUENCE_ACTIVITY_TYPE
- || activityDTO.getActivityTypeID() == Activity.PARALLEL_ACTIVITY_TYPE
- || activityDTO.getActivityTypeID() == Activity.OPTIONS_ACTIVITY_TYPE)
- iter.remove();
}
for (AuthoringActivityDTO actDto : sortedActList) {
@@ -565,7 +566,18 @@
else if(actDto.getActivityTypeID().equals(Activity.SCHEDULE_GATE_ACTIVITY_TYPE) || actDto.getActivityTypeID().equals(Activity.PERMISSION_GATE_ACTIVITY_TYPE)
|| actDto.getActivityTypeID().equals(Activity.SYNCH_GATE_ACTIVITY_TYPE))
att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF + IMS_TAG_GATE + "-" + actDto.getActivityID());
- else
+ else if(actDto.getActivityTypeID() == Activity.SEQUENCE_ACTIVITY_TYPE
+ || actDto.getActivityTypeID() == Activity.PARALLEL_ACTIVITY_TYPE
+ || actDto.getActivityTypeID() == Activity.OPTIONS_ACTIVITY_TYPE) {
+
+ if(actDto.getActivityTypeID().equals(Activity.OPTIONS_ACTIVITY_TYPE))
+ att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_OPTIONAL + "-" + actDto.getActivityID());
+ else if(actDto.getActivityTypeID().equals(Activity.PARALLEL_ACTIVITY_TYPE))
+ att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_PARALLEL + "-" + actDto.getActivityID());
+ else if(actDto.getActivityTypeID().equals(Activity.SEQUENCE_ACTIVITY_TYPE))
+ att = new Attribute(IMS_ATTR_REF, IMS_PREFIX_COMPLEX_REF + IMS_TAG_SEQUENCE + "-" + actDto.getActivityID());
+
+ } else
att = new Attribute(IMS_ATTR_REF,IMS_PREFIX_ACTIVITY_REF + actDto.getToolSignature() + "-" + actDto.getToolContentID());
ref.setAttribute(att);