From derek@sofaswitch.org Tue Nov 14 19:05:55 2006
From: SofaSWITCH SVN <derek@sofaswitch.org>
To: sofaswitch-svn@lists.freeswitch.org
Subject: [Sofaswitch-svn] [commit] r201 - in sofaswitch/trunk/callflow:
	docs/current src tests
Date: Tue, 14 Nov 2006 19:05:55 -0500
Message-ID: <E1Gk8Hr-0002O4-3B@chaos.freeswitch.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7568310860572624695=="

--===============7568310860572624695==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: derek
Date: Tue Nov 14 19:05:53 2006
New Revision: 201

Modified:
   sofaswitch/trunk/callflow/docs/current/eachicon.dxy
   sofaswitch/trunk/callflow/src/eventer.cpp
   sofaswitch/trunk/callflow/src/python.cpp
   sofaswitch/trunk/callflow/src/shapelist.cpp
   sofaswitch/trunk/callflow/src/timer.cpp
   sofaswitch/trunk/callflow/tests/timetest.src

Log:
Adjust timer to work on python code.
Make the reading of the graph file more robust.
Make the timer more robust to cope with incorrect user input.


Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/docs/current/eachicon.dxy	(original)
+++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy	Tue Nov 14 19:05:53 2=
006
@@ -8,6 +8,7 @@
=20
 The control structures described in this page are
 \li \ref subsecConditional
+\li \ref subsecEndCall
 \li \ref subsecEndEverything
 \li \ref subsecEndProcessing
 \li \ref subsecEventer
@@ -88,8 +89,31 @@
 should go. In this example,  it would "work", in that there is no=20
 difference if either path is followed.
=20
+\subsection subsecEndCall End a call
+End  a call to some external entity is indicated by the toolbar icon and dra=
wing area
+image of =20
+<CENTER><TABLE frame=3Dvoid border=3D0><TR><TD>
+\image html endcall.png=20
+</TD><TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+</TD><TD>
+\image html EndCall.png
+</TD></TR>
+</TABLE></CENTER>
=20
+On clicking the right mouse button on this shape, a window comes up. The tool
+tip is as described before.
=20
+The worker node is a preexisting node on some external application that was
+created in response to a "Request Node" operation, and is currently in a call
+to some external entity. Note that while it is incorrect operation to
+endeavour to end  a call not yet in existance, no damage will result. The
+remote worker node will ignore this command.
+
+This command will not cause the remote worker node to die. Thus, one could
+hangup the call, and then make a new call on the same worker node.
+
+
 \subsection subsecRequestNode Request Node=20
=20
 The toolbar icon and a rendering of a drawing area shape for the "Request No=
de"
@@ -290,6 +314,27 @@
=20
 You may specify the file to read from at any time after the creation of the
 answering machine worker node.=20
+
+
+\subsection subsecTimer Timer
+A timer is indicated by the toolbar icon and drawing area image of
+<CENTER><TABLE frame=3Dvoid border=3D0><TR><TD>
+\image html miniclock.png=20
+</TD><TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+</TD><TD>
+\image html starttimer.png
+</TD></TR>
+</TABLE></CENTER>
+
+On clicking the right mouse button on this shape, a window comes up. The tool
+tip is as described before.
+
+The time period is specified in units of seconds. You may use a floating poi=
nt
+number here with  an exponent, or a python variable. Thus, one would specify=
 a
+delay of 1200 milliseconds as 1.2.
+
+The label one applies to the timer is specified on the=20
=20
=20
 \subsection subsecWriteToFile Write to file

Modified: sofaswitch/trunk/callflow/src/eventer.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/src/eventer.cpp	(original)
+++ sofaswitch/trunk/callflow/src/eventer.cpp	Tue Nov 14 19:05:53 2006
@@ -163,7 +163,8 @@
   file.AddLine(wxString::Format("                    %s, ", outputLabel2.c_s=
tr()));
=20
   file.AddLine(wxString::Format("            \"Event Python\" : "));
-  file.AddLine(wxString::Format("                    \"%s\", ", displayData[=
1].data.c_str()));
+  wxString dest =3D ProtectString(displayData[1].data);
+  file.AddLine(wxString::Format("                    \"%s\", ", dest.c_str()=
));
=20
   file.AddLine(wxString::Format("            \"Event RegExp\" : "));
   file.AddLine(wxString::Format("                    \"%s\", ", displayData[=
2].data.c_str()));
@@ -178,6 +179,6 @@
=20
 bool DndShapeEventer::CheckOutputPointsLinked()
 {
-    return outputPoints.PointLinked(0);
+    return outputPoints.PointLinked(0) && outputPoints.PointLinked(1);
 }   =20
=20

Modified: sofaswitch/trunk/callflow/src/python.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/src/python.cpp	(original)
+++ sofaswitch/trunk/callflow/src/python.cpp	Tue Nov 14 19:05:53 2006
@@ -20,11 +20,11 @@
 DndShapePython::DndShapePython()
     : DndShape(Python)
 {
-        wxSize newSize(50, 50);
+        wxSize newSize(32, 60);
         SetSize(newSize);
               =20
-        relInputPoints.Add(25, 0);
-        relOutputPoints.Add(25, 50);
+        relInputPoints.Add(16, 0);
+        relOutputPoints.Add(16, 50);
=20
 	displayData[displayData.size()] =3D=20
 	    InformationSection(wxT("Python Code"), wxT("self.i =3D 0"));
@@ -39,17 +39,17 @@
   dc.SetPen(*wxBLACK_PEN);
  =20
   wxPoint p1(m_rect.GetPosition());
-  wxPoint pA(p1.x + 25, p1.y + 9);
-  wxPoint pB(p1.x + 25, p1.y + 0);
-  wxPoint pC(p1.x + 25, p1.y + 50);
-  wxPoint pD(p1.x + 25, p1.y + 41);
+  wxPoint pA(p1.x + 16, p1.y + 14);
+  wxPoint pB(p1.x + 16, p1.y + 0);
+  wxPoint pC(p1.x + 16, p1.y + 60);
+  wxPoint pD(p1.x + 16, p1.y + 46);
=20
   DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose);
   DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose);
   dc.DrawLine(pA, pB);
   dc.DrawLine(pD, pC);
=20
-  dc.DrawBitmap(Python_xpm, p1.x + 9, p1.y + 9, true);
+  dc.DrawBitmap(Python_xpm, p1.x, p1.y + 14, true);
  =20
   DndShape::Draw(dc);
 }

Modified: sofaswitch/trunk/callflow/src/shapelist.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/src/shapelist.cpp	(original)
+++ sofaswitch/trunk/callflow/src/shapelist.cpp	Tue Nov 14 19:05:53 2006
@@ -330,7 +330,11 @@
   file.AddLine("      \"\"\"                                     ");
   file.AddLine("      self.gd=3Dopen(graphFile, \"r\");            ");
   file.AddLine("      self.gdc=3Dself.gd.read()                    ");
-  file.AddLine("      self.data =3D eval(self.gdc)                 ");
+  file.AddLine("      try:                                       ");
+  file.AddLine("         self.data =3D eval(self.gdc)              ");
+  file.AddLine("      except:                                    ");
+  file.AddLine("          print \"Failed to evaluate (as Python) the supplie=
d graph file of \", graphFile");
+  file.AddLine("          return                                 ");
   file.AddLine("      self.gd.close()                            ");
   file.AddLine("                                                 ");
   file.AddLine("      self.firstNode =3D None                      "); =20

Modified: sofaswitch/trunk/callflow/src/timer.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/src/timer.cpp	(original)
+++ sofaswitch/trunk/callflow/src/timer.cpp	Tue Nov 14 19:05:53 2006
@@ -38,10 +38,10 @@
     relOutputPoints.Add(25, 50);
    =20
     displayData[displayData.size()] =3D=20
-	InformationSection(wxT("Timer period (seconds)"), wxT("2"));
+	InformationSection(wxT("Timer period (seconds, Python code)"), wxT("2"));
    =20
     displayData[displayData.size()] =3D=20
-	InformationSection(wxT("Timer label (string literal)"), wxT("thistimer"));
+	InformationSection(wxT("Timer label (Python code)"), wxT("self.myId + \"thi=
stimer\""));
    =20
     AdjustIoPoints();
 }
@@ -59,6 +59,7 @@
 {
   dc.SetPen(*wxBLACK_PEN);
   DrawCompileError(dc);
+  dc.SetPen(*wxBLACK_PEN);
=20
   wxPoint p1(m_rect.GetPosition());
   wxPoint pA(p1.x + 25, p1.y + 0);
@@ -88,12 +89,22 @@
=20
 bool DndShapeTimer::WriteSystemCode(wxTextFile & file)
 {
-  file.AddLine("   def Timer(self, sTuple): ");
-  file.AddLine("      a,b,c =3D sTuple");
-  file.AddLine("      eName =3D self.data[a][\"Timer label\"] ");
-  file.AddLine("      self.pendingEvents[eName] =3D a ");
-  file.AddLine("      reactor.callLater(self.data[a][\"Timer period\"], self=
.timerObjectExpired, eName)");
-  file.AddLine("      return  self.data[a][\"Output\"]");
+  file.AddLine("   def Timer(self, sTuple):                                 =
                            ");
+  file.AddLine("      a,b,c =3D sTuple                                      =
                              ");
+  file.AddLine("      try:                                                  =
                            ");
+  file.AddLine("          eName =3D eval(self.data[a][\"Timer label\"])     =
                              ");
+  file.AddLine("      except:                                               =
                            ");
+  file.AddLine("          print \"The timer label of \", self.data[a][\"Time=
r label\"], \" was unintelligible Python\" ");
+  file.AddLine("          return  self.data[a][\"Output\"]                  =
                            ");
+  file.AddLine("      self.pendingEvents[eName] =3D a                       =
                              ");
+  file.AddLine("      try:                                                  =
                            ");
+  file.AddLine("          self.period =3D eval (self.data[a][\"Timer period\=
"])                           ");
+  file.AddLine("      except:                                               =
                            ");
+  file.AddLine("          print \"The timer period of \", self.data[a][\"Tim=
er period\"], \" was unintelligible\" ");
+  file.AddLine("          return  self.data[a][\"Output\"]                  =
                            ");
+  file.AddLine("                                                            =
                            ");
+  file.AddLine("      reactor.callLater(self.period, self.timerObjectExpired=
, eName) ");
+  file.AddLine("      return  self.data[a][\"Output\"]                      =
                            ");
   file.AddLine("");
=20
   return true;
@@ -114,10 +125,12 @@
   file.AddLine(wxString::Format("                    %s, ", outputLabel.c_st=
r()));
=20
   file.AddLine(wxString::Format("            \"Timer period\" : "));
-  file.AddLine(wxString::Format("                    %s, ", displayData[1].d=
ata.c_str()));
+  wxString dest =3D ProtectString(displayData[1].data);
+  file.AddLine(wxString::Format("                    \"%s\", ", dest.c_str()=
));
=20
   file.AddLine(wxString::Format("            \"Timer label\" : "));
-  file.AddLine(wxString::Format("                   \"%s\", ", displayData[2=
].data.c_str()));
+  dest =3D ProtectString(displayData[2].data);
+  file.AddLine(wxString::Format("                   \"%s\", ", dest.c_str())=
);
=20
   file.AddLine(wxString::Format("            },"));
=20

Modified: sofaswitch/trunk/callflow/tests/timetest.src
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- sofaswitch/trunk/callflow/tests/timetest.src	(original)
+++ sofaswitch/trunk/callflow/tests/timetest.src	Tue Nov 14 19:05:53 2006
@@ -1 +1 @@
-12<B>335<B>275<B> extra  <special>Tool Tip<ms>Timer<ms><special>Timer period=
 (seconds)<ms>10<ms><special>Timer label (string literal)<ms>t10<ms><special>=
 <B><Shape>10<B>334<B>370<B> extra  <special>Tool Tip<ms>Python<ms><special>P=
ython Code<ms>print  "t10      ", time.asctime(),   "          data is ",    =
 self.timer3<ms><special> <B><Shape>2<B>204<B>419<B> extra  <special>Tool Tip=
<ms>End Processing<ms><special> <B><Shape>10<B>126<B>221<B> extra  <special>T=
ool Tip<ms>Python<ms><special>Python Code<ms>print  "t1       ", time.asctime=
(),  "          data is ", self.timer1Data<ms><special> <B><Shape>9<B>231<B>3=
51<B>232,351,231,422<special>Tool Tip<ms>Join blocks shape<ms><special> <B><S=
hape>12<B>207<B>202<B> extra  <special>Tool Tip<ms>Timer<ms><special>Timer pe=
riod (seconds)<ms>2<ms><special>Timer label<ms>timer2<ms><special> <B><Shape>=
14<B>139<B>179<B> extra  <special>Tool Tip<ms>Eventer<ms><special>Event sough=
t (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer1<ms><spec=
ial>Python variable to hold event data<ms>self.timer1Data<ms><special> <B><Sh=
ape>9<B>188<B>201<B>188,201,231,202<special>Tool Tip<ms>Join blocks shape<ms>=
<special> <B><Shape>20<B>346<B>417<B> extra  <special>Tool Tip<ms>Death<ms><s=
pecial> <B><Shape>12<B>127<B>125<B> extra  <special>Tool Tip<ms>Timer<ms><spe=
cial>Timer period (seconds)<ms>1<ms><special>Timer label<ms>timer1<ms><specia=
l> <B><Shape>10<B>207<B>305<B> extra  <special>Tool Tip<ms>Python<ms><special=
>Python Code<ms>print  "t2       ", time.asctime(),  "          data is ", se=
lf.timer2<ms><special> <B><Shape>10<B>123<B>74<B> extra  <special>Tool Tip<ms=
>Python<ms><special>Python Code<ms>print "Start    ", time.asctime()<ms><spec=
ial> <B><Shape>1<B>123<B>26<B> extra  <special>Tool Tip<ms>Start Processing<m=
s><special> <B><Shape>9<B>150<B>271<B>150,271,152,406,223,407,229,423<special=
>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>14<B>347<B>327<B> extra=
  <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms>=
<special>Event sought (Regular Exp)<ms>10<ms><special>Python variable to hold=
 event data<ms>self.timer3<ms><special> <B><Shape>9<B>270<B>278<B>270,280,359=
,278<special>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>14<B>220<B>=
256<B> extra  <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python c=
ode)<ms><ms><special>Event sought (Regular Exp)<ms>timer2<ms><special>Python =
variable to hold event data<ms>self.timer2<ms><special> <B><Shape>
+10<B>36<B>110<B> extra  <special>Tool Tip<ms>Python<ms><special>Python Code<=
ms>print "Start    ", time.asctime()<ms><special> <B><Shape>9<B>150<B>271<B>1=
50,271,152,406,223,407,229,423<special>Tool Tip<ms>Join blocks shape<ms><spec=
ial> <B><Shape>9<B>188<B>201<B>188,201,231,202<special>Tool Tip<ms>Join block=
s shape<ms><special> <B><Shape>2<B>394<B>380<B> extra  <special>Tool Tip<ms>E=
nd Processing<ms><special> <B><Shape>12<B>333<B>273<B> extra  <special>Tool T=
ip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>self.gap<ms><s=
pecial>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <B><=
Shape>10<B>214<B>303<B> extra  <special>Tool Tip<ms>Python<ms><special>Python=
 Code<ms>print  "t2       ", time.asctime(),  "          data is ", self.time=
r2<ms><special> <B><Shape>14<B>139<B>179<B> extra  <special>Tool Tip<ms>Event=
er<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regul=
ar Exp)<ms>timer1<ms><special>Python variable to hold event data<ms>self.time=
r1Data<ms><special> <B><Shape>14<B>347<B>327<B> extra  <special>Tool Tip<ms>E=
venter<ms><special>Event sought (Python code)<ms>self.myId + "thistimer"<ms><=
special>Event sought (Regular Exp)<ms><ms><special>Python variable to hold ev=
ent data<ms>self.timer3<ms><special> <B><Shape>20<B>346<B>417<B> extra  <spec=
ial>Tool Tip<ms>Death<ms><special> <B><Shape>10<B>36<B>158<B> extra  <special=
>Tool Tip<ms>Python<ms><special>Python Code<ms>self.gap=3D10<ms><special> <B>=
<Shape>10<B>133<B>218<B> extra  <special>Tool Tip<ms>Python<ms><special>Pytho=
n Code<ms>print  "t1       ", time.asctime(),  "          data is ", self.tim=
er1Data<ms><special> <B><Shape>14<B>220<B>256<B> extra  <special>Tool Tip<ms>=
Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (=
Regular Exp)<ms>timer2<ms><special>Python variable to hold event data<ms>self=
.timer2<ms><special> <B><Shape>9<B>231<B>351<B>232,351,231,422<special>Tool T=
ip<ms>Join blocks shape<ms><special> <B><Shape>9<B>271<B>275<B>271,277,360,27=
5<special>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>10<B>342<B>368=
<B> extra  <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print  "t10=
      ", time.asctime(),   "          data is ",     self.timer3<ms><special>=
 <B><Shape>2<B>204<B>419<B> extra  <special>Tool Tip<ms>End Processing<ms><sp=
ecial> <B><Shape>12<B>29<B>207<B> extra  <special>Tool Tip<ms>Timer<ms><speci=
al>Timer period (seconds, Python code)<ms>1.95<ms><special>Timer label (Pytho=
n code)<ms>"timer1"<ms><special> <B><Shape>9<B>399<B>349<B>399,349,420,352,41=
8,379<special>Tool Tip<ms>Join blocks shape<ms><special> <B><Shape>9<B>54<B>1=
57<B>153,177,156,157,105,167,73,282,57,279,54,254<special>Tool Tip<ms>Join bl=
ocks shape<ms><special> <B><Shape>1<B>28<B>63<B> extra  <special>Tool Tip<ms>=
Start Processing<ms><special> <B><Shape>12<B>209<B>203<B> extra  <special>Too=
l Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>2<ms><speci=
al>Timer label (Python code)<ms>"timer2"<ms><special> <B><Shape>


--===============7568310860572624695==--