Changeset 10885

Timestamp:

09/26/11 13:46:59 (20 months ago)

Author:

Snyder.Jason

Message:

changes for changing the naming service

Files:

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

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

@@ -8 +8 @@
 from BaseHTTPServer import HTTPServer
 import wavedash.src.WaveformModel
+import omniORB
 
 def buildController(request, address=None):
@@ -13 +14 @@
         ctrlr.createWidgetContainer()  
         if address is not None:
-                print 'here'
                 request.session['namingService'] = address
                 ctrlr.CORBAutils.setNamingService(str(address))
         else:
-                print 'there'
-                namingService = request.session.get('namingService') 
+                namingService = request.session.get('namingService')  
                 if namingService:
                         ctrlr.CORBAutils.setNamingService(str(namingService))
 
-        print 'naming service: ' + ctrlr.CORBAutils.getNamingService()
-        ctrlr.CORBAutils.init_CORBA(False)
+        result = ctrlr.CORBAutils.init_CORBA(False)
+        if result == -1:
+                return None
         ctrlr.buildModel()
         return ctrlr
 
-def waveforms(request):
+def updateNamingService(request):
+        newAddress = request.POST['namingServiceText']
+        request.session['namingService'] = newAddress
+        
+        message = "Naming Service Update successful!"
+        link = '/WebDash/'
+        return render_to_response('WebDash/message.html',
+                                                                {'message' : message, 'link' : link}, context_instance=RequestContext(request))
+        
+
+def waveforms(request): 
         ctrlr = buildController(request)
         availableList = ctrlr.model.getSystemWaveforms()
@@ -33 +43 @@
         
 def index(request):     
-        ctrlr = buildController(request)
-
+        print request.session['namingService']
+        ctrlr = buildController(request)
+        
+        
+        if ctrlr == None:
+                error = "Error creating controller"
+                return render_to_response('WebDash/error.html', {'error' : error}, context_instance=RequestContext(request))
+
+        print 'naming service: ' + ctrlr.CORBAutils.getNamingService()
         availableList = ctrlr.model.getSystemWaveforms()
         instancesList = []      
@@ -46 +63 @@
         
         return render_to_response('WebDash/index.html', 
-                                                          {'availableList' : availableList, 'instancesList' : instancesList})
+                                                          {'availableList' : availableList, 'instancesList' : instancesList, 'address' : request.session.get('namingService')}, context_instance=RequestContext(request))
         
 def index2(request, address):
-        print address
         ctrlr = buildController(request, address)
         
@@ -63 +79 @@
         
         return render_to_response('WebDash/index.html', 
-                                                          {'availableList' : availableList, 'instancesList' : instancesList})
+                                                          {'availableList' : availableList, 'instancesList' : instancesList}, context_instance=RequestContext(request))
 
 def running_page(request):
@@ -191 +207 @@
                 
         
+
 def getControlMap(request):
         map = request.session.get('controlMap')