Index: lams_build/conf/unix/lams/lams.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/unix/lams/Attic/lams.xml,v diff -u -r1.15 -r1.16 --- lams_build/conf/unix/lams/lams.xml 4 Sep 2006 03:50:52 -0000 1.15 +++ lams_build/conf/unix/lams/lams.xml 6 Sep 2006 05:09:07 -0000 1.16 @@ -34,12 +34,7 @@ 1.1 en_AU LTR - - - en_AU - 2006-01-02 - - + 2006-01-02 shaun.melcoe.mq.edu.au conference.shaun.melcoe.mq.edu.au admin Index: lams_build/conf/windows/lams/lams.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/windows/lams/Attic/lams.xml,v diff -u -r1.12 -r1.13 --- lams_build/conf/windows/lams/lams.xml 4 Sep 2006 03:50:52 -0000 1.12 +++ lams_build/conf/windows/lams/lams.xml 6 Sep 2006 05:09:07 -0000 1.13 @@ -34,12 +34,7 @@ 2.0.@datetimestamp@ en_AU LTR - - - en_AU - 2006-01-02 - - + 2006-01-02 shaun.melcoe.mq.edu.au conference.shaun.melcoe.mq.edu.au admin Index: lams_central/src/flash/main.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/Attic/main.as,v diff -u -r1.8 -r1.9 Binary files differ Index: lams_central/src/flash/main2.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/Attic/main2.as,v diff -u -r1.8 -r1.9 Binary files differ Index: lams_central/src/flash/main_addseq.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/Attic/main_addseq.as,v diff -u -r1.3 -r1.4 Binary files differ Index: lams_central/src/flash/main_monitoring.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/Attic/main_monitoring.as,v diff -u -r1.3 -r1.4 Binary files differ Index: lams_central/web/author.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/author.jsp,v diff -u -r1.23 -r1.24 --- lams_central/web/author.jsp 4 Sep 2006 02:11:32 -0000 1.23 +++ lams_central/web/author.jsp 6 Sep 2006 05:05:36 -0000 1.24 @@ -19,7 +19,7 @@ String authoringClientVersion = Configuration.get(ConfigurationKeys.AUTHORING_CLIENT_VERSION); String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); -String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage); +String languageDate = Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED); %> @@ -232,7 +232,7 @@ -?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&theme=&uniqueID= +?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&uniqueID= lams_preloader.swf lams_preloader Index: lams_common/src/flash/org/lamsfoundation/lams/common/Config.as =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/Attic/Config.as,v diff -u -r1.23 -r1.24 Binary files differ Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/dict/Attic/Dictionary.as,v diff -u -r1.18 -r1.19 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 3 Apr 2006 23:36:53 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 6 Sep 2006 05:05:36 -0000 1.6 @@ -65,22 +65,16 @@ } /** - * Retrieves the date in which the specified dictionary was created. + * Retrieves the date in which the specified dictionary was created/updated. * If the dictionary isnt found, null is returned. - * @param language * @return */ - public static String getDictionaryDateForLanguage(String dictionary) + public static String getDictionaryDateForLanguage() { - if ((items != null)&&(items.get(ConfigurationKeys.DICTIONARY_DATES)!=null)) - { - Map map = (Map)items.get(ConfigurationKeys.DICTIONARY_DATES); - if (map!=null && map.get(dictionary) != null) - { - return (String)map.get(dictionary); - } - } - return null; + if ((items != null)&&(items.get(ConfigurationKeys.DICTIONARY_DATE_CREATED)!=null)) + return (String)items.get(ConfigurationKeys.DICTIONARY_DATE_CREATED); + else + return null; } } Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.15 -r1.16 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 4 Sep 2006 02:12:33 -0000 1.15 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 6 Sep 2006 05:05:36 -0000 1.16 @@ -112,14 +112,18 @@ /** Direction (left to right, right to left) for writing on HTML pages. Originally LTR */ public static String SERVER_PAGE_DIRECTION = "ServerPageDirection"; - public static String DICTIONARY_DATES = "DictionaryDates"; + /** universal date of dictionary updates */ + public static String DICTIONARY_DATE_CREATED = "DictionaryDateCreated"; + /** deprecated */ public static String DICTIONARY = "Dictionary"; - + + /** deprecated */ public static String DICTIONARY_CREATE_DATE = "createDate"; - + + /** deprecated */ public static String DICTIONARY_LANGUAGE = "language"; - + public static String XMPP_DOMAIN = "XmppDomain"; public static String XMPP_CONFERENCE = "XmppConference"; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationLoader.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/Attic/ConfigurationLoader.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationLoader.java 3 Apr 2006 23:36:53 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationLoader.java 6 Sep 2006 05:05:36 -0000 1.9 @@ -110,17 +110,8 @@ if(node.getNodeType()== Node.ELEMENT_NODE){ Element ele = (Element)node; - - // DictionaryDates have a more complex structure than the rest of the configuration file. - if (ele.getNodeName().equals(ConfigurationKeys.DICTIONARY_DATES)) - { - loadDictionaryDates(ele, items); - } - else - { - if(ele.getLastChild()!=null){ + if(ele.getLastChild()!=null){ items.put(ele.getNodeName(),ele.getLastChild().getNodeValue()); - } } } } @@ -150,6 +141,7 @@ * * @param ele * @param items The main hashmap where the elements are stored. + * @deprecated */ private static void loadDictionaryDates(Element ele, Map items) { @@ -173,6 +165,7 @@ * key->value pair. * @param dictionary * @param dictionaryItems The separate hashMap in which to store the different dictionary and the date it was created. + * @deprecated */ private static void storeDictionaryDetailsInMap(Element dictionary, HashMap dictionaryItems) {