Changeset 10555

Timestamp:

12/06/10 10:23:04 (2 years ago)

Author:

Snyder.Jason

Message:

added listAllInstances command to list all currently running waveform instances. also added line breaks to output of other commands

Files:

• ossiedev/trunk/tools/wavedash/src/WavedashHandler.py (modified) (3 diffs)

ossiedev/trunk/tools/wavedash/src/WavedashHandler.py

@@ -44 +44 @@
             self.end_headers()
             for w in list:
-                self.wfile.write(str(w.getName()) + '\n\n')
+                self.wfile.write(str(w.getName()) + '<br>')
         elif(command == "listInstanceWaveforms"):
             list = self.server.getInstanceWaveforms(self.params['waveform'])
@@ -51 +51 @@
             self.end_headers()
             for w in list:
-                self.wfile.write(str(w.getName()) + '\n\n')
+                self.wfile.write(str(w.getName()) + '<br>')
+        elif(command == "listAllInstances"):
+            systemWaveforms = self.server.getSystemWaveforms()
+            self.send_response(200)
+            self.send_header('Content-type', 'text/html')
+            self.end_headers()
+            for waveform in systemWaveforms:
+                instances = self.server.getInstanceWaveforms(waveform.getName())
+                if instances != None:
+                    for instance in instances:
+                        self.wfile.write(str(instance.getName()) + '<br>')
                 
         #commands that perform an action on the model but don't return
@@ -72 +82 @@
         #Change port number here to run server on a different port
         #When using port 80, the WavedashHandler must be run as root
-        server = WavedashServer(('', 4444), WavedashHandler)
+        server = WavedashServer(('', 4443), WavedashHandler)
         server.initializeWavedashController()
         print 'started httpserver...'