[tuxdroid-svn] r4556 - softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system

[remi <c2m...@c2...>]

Author: remi
Date: 2009-04-18 14:21:36 +0200 (Sat, 18 Apr 2009)
New Revision: 4556

Modified:
   softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceAttituneManager.py
   softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
   softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceScheduler.py
Log:
* fixed attitunes, gadgets and task order by name.

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceAttituneManager.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceAttituneManager.py	2009-04-18 09:44:05 UTC (rev 4555)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceAttituneManager.py	2009-04-18 12:21:36 UTC (rev 4556)
@@ -336,8 +336,13 @@
         contentStruct = self.getDefaultContentStruct()
         contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
         attitunes = resourceAttituneManager.getAttitunesContainer().getAttitunes()
-        for i, attitune in enumerate(attitunes):
-            d_name = "data|%d" % i
+        attitunesNameList = []
+        for attitune in attitunes:
+            attitunesNameList.append(attitune.getDescription().getName())
+        attitunesNameList.sort()
+        for i, attituneName in enumerate(attitunesNameList):
+            attitune = resourceAttituneManager.getAttitunesContainer().getAttitune(attituneName)
+            d_name = "data|%.3d" % i
             structure = attitune.getDescription().getDictionary()
             contentStruct['root'][d_name] = structure
         return headersStruct, contentStruct

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py	2009-04-18 09:44:05 UTC (rev 4555)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py	2009-04-18 12:21:36 UTC (rev 4556)
@@ -502,12 +502,16 @@
         contentStruct = self.getDefaultContentStruct()
         contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
         gadgets = resourceGadgetFramework.getGadgetsContainer().getGadgets()
-        for i, gadget in enumerate(gadgets):
-            d_name = "data|%d" % i
+        gadgetsNameList = []
+        for gadget in gadgets:
+            gadgetsNameList.append(gadget.getDescription().getName())
+        gadgetsNameList.sort()
+        for i, gadgetName in enumerate(gadgetsNameList):
+            gadget = resourceGadgetFramework.getGadgetsContainer().getGadgetByName(gadgetName)
+            d_name = "data|%.3d" % i
             structure = WebGadgetTools.generateWebGadgetStructure(gadget,
                 '/gadget_framework/web_gadget?',
                 gadget.getDefaultRunCommandName(), {})
-            #del structure['command']
             structure['commands'] = {}
             for j, command in enumerate(gadget.getCommands()):
                 c_name = "command_%.3d" % j

Modified: softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceScheduler.py
===================================================================
--- softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceScheduler.py	2009-04-18 09:44:05 UTC (rev 4555)
+++ softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceScheduler.py	2009-04-18 12:21:36 UTC (rev 4556)
@@ -324,8 +324,13 @@
         contentStruct = self.getDefaultContentStruct()
         contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
         tasks = resourceScheduler.getScheduler().getTasks()
-        for i, task in enumerate(tasks):
-            d_name = "data|%d" % i
+        tasksNameList = []
+        for task in tasks:
+            tasksNameList.append(task.getDescription().getName())
+        tasksNameList.sort()
+        for i, taskName in enumerate(tasksNameList):
+            task = resourceScheduler.getScheduler().getTaskByName(taskName)
+            d_name = "data|%.3d" % i
             struct = task.getDictionary()
             contentStruct['root'][d_name] = struct
         return headersStruct, contentStruct