Changeset 10891 for ossiedev/trunk/tools/cornetApps/WebDash/views.py

Timestamp:

09/29/11 09:49:37 (20 months ago)

Author:

Snyder.Jason

Message:

removed a bunch of debugging output

Files:

• ossiedev/trunk/tools/cornetApps/WebDash/views.py (modified) (7 diffs)

ossiedev/trunk/tools/cornetApps/WebDash/views.py

@@ -43 +43 @@
         
 def index(request):     
-        print request.session['namingService']
         ctrlr = buildController(request)
         
@@ -51 +50 @@
                 return render_to_response('WebDash/error.html', {'error' : error}, context_instance=RequestContext(request))
 
-        print 'naming service: ' + ctrlr.CORBAutils.getNamingService()
         availableList = ctrlr.model.getSystemWaveforms()
         instancesList = []      
@@ -67 +65 @@
 def index2(request, address):
         ctrlr = buildController(request, address)
-        
+        if ctrlr == None:
+                error = "Error creating controller"
+                return render_to_response('WebDash/error.html', {'error' : error}, context_instance=RequestContext(request))
         availableList = ctrlr.model.getSystemWaveforms()
         instancesList = []      
@@ -83 +83 @@
 def running_page(request):
         ctrlr = buildController(request)
+        if ctrlr == None:
+                error = "Error creating controller"
+                return render_to_response('WebDash/error.html', {'error' : error}, context_instance=RequestContext(request))
 
         availableList = ctrlr.model.getSystemWaveforms()
@@ -110 +113 @@
 
 def display(request, instance):
-        print 'in display: '
-        print '         request: ' + str(request)
-        print '         instance: ' + str(instance)
+        
         ctrlr = buildController(request)
         
@@ -123 +124 @@
                 properties = comp.properties
                 for prop in properties:
-                        print prop.name + ": " + str(prop.type)
-                        for widget in ctrlr.getOptionalWidgets(prop.type):
-                                print widget.type
                         propMap[prop.name] = ctrlr.getOptionalWidgets(prop.type)
                 
@@ -198 +196 @@
                 map[key] = widgetType
                 request.session['controlMap'] = map
-                print map