Author: derek Date: Fri Sep 8 00:06:25 2006 New Revision: 83 Modified: sofaswitch/trunk/callflow/src/shapelist.cpp Log: Fix file so it correctly connects with twisted, and has read in the graph file. Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Fri Sep 8 00:06:25 2006 @@ -298,7 +298,7 @@ file.AddLine("class Controller(protocol.Protocol): "); file.AddLine(" def __init__(self): "); file.AddLine(" self.graphSet = False "); - file.AddLine(" self.connectionMade = False "); + file.AddLine(" self.connectionIsMade = False "); file.AddLine(" self.endProgramNow = False "); char c= 34; wxString tString = wxString::Format(" self.quote = \"\\%c\"", c); @@ -308,25 +308,25 @@ file.AddLine(" def setGraphData(self, graphFile): "); file.AddLine(" self.gd=open(graphFile, \"r\"); "); file.AddLine(" self.gdc=self.gd.read() "); - file.AddLine(" self.data = evel(self.gdc) "); + file.AddLine(" self.data = eval(self.gdc) "); file.AddLine(" self.gd.close() "); file.AddLine(" "); file.AddLine(" self.firstNode = None "); - file.AddLine(" for k,v in aa.data.iteritems(): "); + file.AddLine(" for k,v in self.data.iteritems(): "); file.AddLine(" if k[:16] == \"Start_Processing\": "); file.AddLine(" self.firstNode = k "); file.AddLine(" print \"first node is \", k "); file.AddLine(" break "); file.AddLine(" self.timeout = reactor.callLater(0, self.startTimerExpired, \"graph\")"); - file.AddLine(" "); - file.AddLine(" def startTimerExpired(self, data):"); - file.AddLine(" if data == \"graph\": "); - file.AddLine(" self.connectionMade = True "); - file.AddLine(" if data == \"connected\": "); - file.AddLine(" self.graphSet = True; "); - file.AddLine(" if self.graphSet and self.connectionMade:"); - file.AddLine(" print \"start processing now \" "); - file.AddLine(" "); + file.AddLine(" "); + file.AddLine(" def startTimerExpired(self, data): "); + file.AddLine(" if data == \"graph\": "); + file.AddLine(" self.connectionIsMade = True "); + file.AddLine(" if data == \"connected\": "); + file.AddLine(" self.graphSet = True "); + file.AddLine(" if self.graphSet and self.connectionIsMade:"); + file.AddLine(" print \"start processing now \" "); + file.AddLine(" "); file.AddLine(" def startWorkNow(): "); file.AddLine(" sTuple = \"(\" + self.quote + self.firstNode + self.quote + \", 0, \" +self.quote + \"Start_Processing\" + self.quote + \")\""); file.AddLine(" self.DoWork(eval(sTuple))"); @@ -340,7 +340,12 @@ file.AddLine(" command = \"self.\" + str(c) + \"(\" + str(sTuple) + \")\""); file.AddLine(" a,b,c = sTuple = eval(command)"); file.AddLine(" "); - file.AddLine(" def connectionMade(self): "); + file.AddLine(" def makeConnection(self, transport): "); + file.AddLine(" self.connected = 1 "); + file.AddLine(" self.transport = transport "); + file.AddLine(" self.connectionMade() "); + file.AddLine(" "); + file.AddLine(" def connectionMade(self): "); file.AddLine(" self.myId = \"\" "); file.AddLine(" self.countReceived = 0 "); file.AddLine(" self.transport.write(\"?\\0\") "); @@ -375,30 +380,43 @@ return false; } - file.AddLine(" "); - file.AddLine(" def processReceivedMessage(self, thisMessage): "); - file.AddLine(" print \"Received \", thisMessage "); - file.AddLine(" "); - - file.AddLine("class MyFactory(protocol.ClientFactory): "); - file.AddLine(" protocol = Controller "); - file.AddLine(" "); + file.AddLine(" "); + file.AddLine(" def processReceivedMessage(self, thisMessage): "); + file.AddLine(" print \"Received \", thisMessage "); + file.AddLine(" "); + file.AddLine("class MyFactory(protocol.ClientFactory): "); + file.AddLine(" protocol = Controller "); + file.AddLine(" "); file.AddLine(" def clientConnectionFailed(self, connector, reason): "); - file.AddLine(" print \"Connection failed - goodbye!\" "); - file.AddLine(" reactor.stop() "); - file.AddLine(" "); - file.AddLine(" def clientConnectionLost(self, connector, reason): "); - file.AddLine(" print \"Connection lost - goodbye!\" "); - file.AddLine(" reactor.stop() "); - file.AddLine(" "); - file.AddLine(" def setGraphData(self, graphFile): "); - file.AddLine(" protocol.setGraphData(graphFile) "); - file.AddLine(" "); - file.AddLine("f = MyFactory() "); - file.AddLine("f.setGraphData(\"a_graph\") "); - file.AddLine("reactor.connectTCP(\"localhost\", 5000, f) "); - file.AddLine("reactor.run() "); - file.AddLine(" "); + file.AddLine(" print \"Connection failed - goodbye!\" "); + file.AddLine(" reactor.stop() "); + file.AddLine(" "); + file.AddLine(" def clientConnectionLost(self, connector, reason): "); + file.AddLine(" print \"Connection lost - goodbye!\" "); + file.AddLine(" reactor.stop() "); + file.AddLine(" "); + file.AddLine(" def buildProtocol(self, addr): "); + file.AddLine(" p = self.protocol() "); + file.AddLine(" p.factory = self "); + file.AddLine(" self.myController = p "); + file.AddLine(" self.myController.setGraphData(self.myGraphName) "); + file.AddLine(" print 'finished building Protocol' "); + file.AddLine(" return p "); + file.AddLine(" for key in dir(p): "); + file.AddLine(" if '__' not in key: "); + file.AddLine(" value = getattr(p,key) "); + file.AddLine(" print key "); + file.AddLine(" print key, \" \", value "); + file.AddLine(" return p "); + file.AddLine(" "); + file.AddLine(" def setGraph(self, newName): "); + file.AddLine(" self.myGraphName = newName "); + file.AddLine(" "); + file.AddLine("f = MyFactory() "); + file.AddLine("f.setGraph(\"a_graph\") "); + file.AddLine("reactor.connectTCP(\"localhost\", 5000, f) "); + file.AddLine("reactor.run() "); + file.AddLine(" "); file.Write(); return true; }