Author: derek Date: Fri Sep 15 01:22:32 2006 New Revision: 95 Modified: sofaswitch/trunk/callflow/src/shapelist.cpp Log: Work on processing request new id messages. Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Fri Sep 15 01:22:32 2006 @@ -357,18 +357,28 @@ file.AddLine(" eventerNode = self.currentHandlers[keys[k]] "); file.AddLine(" #print \"eventer node is \", eventerNode "); file.AddLine(" self.DoWork(self.data[eventerNode][\"Event Handler\"])"); - file.AddLine(" self.generatedEvents.pop(keys[k]) "); - file.AddLine(" "); - file.AddLine(" def transferEventToGenerated(self, data): "); + file.AddLine(" self.generatedEvents.pop(keys[k]) "); + file.AddLine(" "); + file.AddLine(" def transferEventToGenerated(self, data): "); file.AddLine(" \"\"\"An event has happened, and now we need to act on it. Consequently, "); file.AddLine(" we take it out of the pending list and put it in the process now list"); - file.AddLine(" \"\"\" "); - file.AddLine(" if self.pendingEvents.has_key(data): "); + file.AddLine(" \"\"\" "); + file.AddLine(" if self.pendingEvents.has_key(data): "); file.AddLine(" self.generatedEvents[data] = self.pendingEvents.pop(data)"); - file.AddLine(" "); - file.AddLine(" def timerObjectExpired(self, data): "); + file.AddLine(" "); + file.AddLine(" def newRemoteNodeToUse(self, eventName, newNode):"); + file.AddLine(" \"\"\"This node has received a message advising us that a remote"); + file.AddLine(" sofa switch entity has created a node for us to use. This method"); + file.AddLine(" has to transfer the pending event to the generated event queue "); + file.AddLine(" and get it activated for processing "); + file.AddLine(" \"\"\" "); + file.AddLine(" self.transferEventToGenerated(eventName) "); + file.AddLine(" reactor.callLater(0, self.processQueue, newNode) "); + file.AddLine(" "); + file.AddLine(" def timerObjectExpired(self, data): "); file.AddLine(" \"\"\"Some timer has expired. Move it from the pending list and place "); - file.AddLine(" it in the active list. Then activate processing so that things move along"); + file.AddLine(" it in the active list. Then activate processing so that things move "); + file.AddLine(" along"); file.AddLine(" \"\"\" "); file.AddLine(" #print \"timer object has expired \", data "); file.AddLine(" self.transferEventToGenerated(data) "); @@ -450,10 +460,13 @@ file.AddLine(" turn it into a MyEvent message, and added to the right "); file.AddLine(" queue. On doing this, spark an event to drive queue processing. "); file.AddLine(" \"\"\" "); - file.AddLine(" #print \"Received \", thisMessage "); + file.AddLine(" print \"Received \", thisMessage "); + file.AddLine(" if (thisMessage.find(\"REQUESTNEWID\") >=0):"); + file.AddLine(" pMsg = str(thisMessage).split(\" \") "); + file.AddLine(" eName = pMsg(":","") "); + file.AddLine(" file.AddLine(" "); file.AddLine(" "); - for (int i = 0; i < DndShape::KnownShapes; i++) { DndShape *thisShape; if (i == DndShape::None)