Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r237b65cfc791d8e6ef928be7e29969b3c5272490 -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r237b65cfc791d8e6ef928be7e29969b3c5272490 -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
diff -u -r43b51e2470e423b972243c08c452cf00e1a9e75a -ra75e72e708fca84f14d1d3ff40eb60689a152474
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 43b51e2470e423b972243c08c452cf00e1a9e75a)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision a75e72e708fca84f14d1d3ff40eb60689a152474)
@@ -43,6 +43,9 @@
     
     //Application instance is stored as a static in the application class
     private static var _instance:Dictionary = null;    
+	private static var DICT_PREFIX:String = "dictionary.";
+	private static var DICT_DATE:String = "dictionary.date";
+	private static var SO_SEPARATOR:String = ".";
 	
     //Defined so compiler can 'see' events added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -83,18 +86,21 @@
 		
 		var _oldDate:Object = null;
 		
-        //Cookie or server?
+        // Cookie or server?
 		Debugger.log('Config.DOUBLE_CLICK_DELAY:'+Config.DOUBLE_CLICK_DELAY,Debugger.GEN,'load','org.lamsfoundation.lams.dict.Dictionary');
 		Debugger.log('Config.USE_CACHE:'+Config.USE_CACHE,Debugger.GEN,'load','org.lamsfoundation.lams.dict.Dictionary');
-        if(CookieMonster.cookieExists('dictionary.date')){
-			_oldDate = CookieMonster.open('dictionary.date', true);
+        if(CookieMonster.cookieExists(DICT_DATE)){
+			_oldDateCookie = CookieMonster.open(DICT_DATE, true);
 		}
 		
 		Debugger.log('Existing date:'+String(_oldDate) + ' Current date:' + String(_currentDate),Debugger.GEN,'load','org.lamsfoundation.lams.dict.Dictionary');
         
-		if(CookieMonster.cookieExists('dictionary.'+language+'.'+app.module) && Config.USE_CACHE && _oldDate != null) {
+		// determine if dictionary should be loaded from cookie file or from server request
+		if(CookieMonster.cookieExists(DICT_PREFIX+language+SO_SEPARATOR+app.module) && Config.USE_CACHE && _oldDateCookie.date != null) {
 			
-			if(this._currentDate != _oldDate){
+			// clear all data if dictionaries have been updated
+			if(this._currentDate != _oldDateCookie.date){
+				clearAll(_oldDateCookie);
 				openFromServer();
 			} else {
 				openFromDisk();
@@ -112,6 +118,23 @@
 		dispatchEvent({type:'init',target:this});		
 	}
  
+	/**
+	 * Remove all stored dictionary data and old dictionary date cookie
+	 * 
+	 * @param   obj Array of language/module combination strings
+	 *
+	 */
+	public function clearAll(obj:Object) {
+		for(var i=0; i<obj.data.length; i++){
+			if(CookieMonster.cookieExists(DICT_PREFIX + obj.data[i])){
+				CookieMonster.deleteCookie(DICT_PREFIX + obj.data[i]);
+			}
+		}
+		
+		if(CookieMonster.cookieExists(DICT_DATE)){
+			CookieMonster.deleteCookie(DICT_DATE);
+		}
+	}
     /**
     * @returns a string holding the text requested
     */
@@ -208,24 +231,62 @@
     * @return  
     */
     public function saveToDisk():Void{
+		
         //Convert to data object and then serialize before saving to a cookie
         var dataObj = toData();
-        CookieMonster.save(dataObj,'dictionary.' + _currentLanguage + '.' + app.module,false);
-		var success = CookieMonster.save(_root.langDate, 'dictionary.date', true);
+		var success = CookieMonster.save(dataObj,DICT_PREFIX + _currentLanguage + SO_SEPARATOR + app.module,false);
+	
+		if (!success) {
+			//TODO DI 30/05/05 raise error if config data can't be saved
+			Debugger.log('Config item could not be saved: ' + _root.langDate ,Debugger.CRITICAL,'saveToDisk','Dictionary');
+		}
+	
+		// open date cookie if exists
+		var dateCookie:Object = null;
+		if(CookieMonster.cookieExists(DICT_DATE)){
+			dateCookie = CookieMonster.open(DICT_DATE, true);
+		}
+	
+		// create new date cookie object
+		var dateObj = new Object();
+		dateObj.date = _root.langDate;
+		dateObj.data = (dateCookie == null) ? new Array() : getDateArray(dateCookie.data);
 		
+		var dataItem:String = _currentLanguage + SO_SEPARATOR + app.module;
+		dateObj.data.push(dataItem);
+		
+		// save to file
+		success = CookieMonster.save(dateObj, DICT_DATE, true);
+		
 		if (!success) {
 			//TODO DI 30/05/05 raise error if config data can't be saved
 			Debugger.log('Config item could not be saved: ' + _root.langDate ,Debugger.CRITICAL,'saveToDisk','Dictionary');
 		}
     }
     
+	/**
+	 * Get the string array of loaded dictionaries
+	 * 
+	 * 
+	 * @param   data 	dictionary date cookie
+	 * @return  		array of loaded dictionaries
+	 */
+	
+	private function getDateArray(data:Array):Array {
+		var arr:Array = new Array();
+		for(var i=0; i<data.length; i++){
+			arr[i] = data[i];
+		}
+		return arr;
+	}
+	
     /**
     * Open the Dictionary from disk 
     */
     public function openFromDisk():Void{
         Debugger.log('opening Dictionary from Shared Object',Debugger.CRITICAL,'openFromDisk','Dictionary');		
 	   
-		var dataObj:Object = CookieMonster.open('dictionary.' + _currentLanguage + '.' + app.module,false);
+		var dataObj:Object = CookieMonster.open(DICT_PREFIX + _currentLanguage + SO_SEPARATOR + app.module,false);
 		createFromData(dataObj);
 		
     }
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r49e27afd23a5b873d800bb0bd341cc0a400f47d8 -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r470e0f35f445c732ef7d26fd07f561a04b80c911 -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r470e0f35f445c732ef7d26fd07f561a04b80c911 -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_monitoring/web/lams_wizard.swf
===================================================================
diff -u -r43b51e2470e423b972243c08c452cf00e1a9e75a -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ
Index: lams_monitoring/web/lams_wizard_library.swf
===================================================================
diff -u -r43b51e2470e423b972243c08c452cf00e1a9e75a -ra75e72e708fca84f14d1d3ff40eb60689a152474
Binary files differ