Author: derek Date: Sun Jul 27 19:26:14 2008 New Revision: 436 Modified: sofaswitch/trunk/callflow/src/requestnode.cpp Log: Tidy up the errorchecking - ensure that the python code copes with faulty input better. Modified: sofaswitch/trunk/callflow/src/requestnode.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/requestnode.cpp (original) +++ sofaswitch/trunk/callflow/src/requestnode.cpp Sun Jul 27 19:26:14 2008 @@ -96,13 +96,25 @@ file.AddLine(wxT(" if y == 0: ")); file.AddLine(wxT(" define=self.data[a][\"Event Source\"] ")); file.AddLine(wxT(" define = define + \" = None\" ")); - file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" try: ")); + file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" except: ")); + file.AddLine(wxT(" print \"Did you specifiy a python variable for the event source for\", a ")); + file.AddLine(wxT(" exit ")); file.AddLine(wxT(" define=self.data[a][\"Event Name\"] ")); file.AddLine(wxT(" define = define + \" = None\" ")); - file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" try: ")); + file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" except: ")); + file.AddLine(wxT(" print \"Did you specifiy a python variable for the event name for\", a ")); + file.AddLine(wxT(" exit ")); file.AddLine(wxT(" define=self.data[a][\"Event Data\"] ")); file.AddLine(wxT(" define = define + \" = None\" ")); - file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" try: ")); + file.AddLine(wxT(" exec(define); ")); + file.AddLine(wxT(" except: ")); + file.AddLine(wxT(" print \"Did you specifiy a python variable for the event data for\", a ")); + file.AddLine(wxT(" exit ")); file.AddLine(wxT(" self.pendingEvents[eName] = (a, eName, \"\") ")); file.AddLine(wxT(" reactor.callLater(self.data[a][\"Timer period\"], self.timerObjectExpired, eName)")); file.AddLine(wxT(" rNode = self.data[a][\"Request node from\"] "));