<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16979] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16979">16979</a></dd>
<dt>Author</dt> <dd>nazim</dd>
<dt>Date</dt> <dd>2010-03-12 17:06:36 -0600 (Fri, 12 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Luaexec improvements</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribnazimxmlcdrdconftestlua">freeswitch/trunk/contrib/nazim/xmlcdrd/conf/test.lua</a></li>
<li><a href="#freeswitchtrunkcontribnazimxmlcdrdpluginsluaexecluaexecc">freeswitch/trunk/contrib/nazim/xmlcdrd/plugins/luaexec/luaexec.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribnazimxmlcdrdconftestlua"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/nazim/xmlcdrd/conf/test.lua (16978 => 16979)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/nazim/xmlcdrd/conf/test.lua 2010-03-12 22:11:43 UTC (rev 16978)
+++ freeswitch/trunk/contrib/nazim/xmlcdrd/conf/test.lua 2010-03-12 23:06:36 UTC (rev 16979)
</span><span class="lines">@@ -1,18 +1,34 @@
</span><del>---print(xcdr_varget("uuid"), xcdr_varget("billsec"), xcdr_varget("uuid") )
</del><ins>+-- Lua script _must_ provide three functions:
+-- luaexec_init()
+-- luaexec_free()
+-- luaexec_man()
+-- Functions listed above can be empty, but they must exist for successful run.
</ins><span class="cx">
</span><del>-uuid = xcdr_varget("uuid")
-billsec = xcdr_varget("billsec")
</del><span class="cx">
</span><del>-
</del><span class="cx"> require "luasql.odbc"
</span><del>-env = assert(luasql.odbc())
-db_conn = assert(env:connect("ddp") )
-db_conn:execute(string.format("insert into cdr (uuid,billsec) values ('%s', %d)", uuid, billsec))
</del><span class="cx">
</span><del>-db_conn:close()
-env:close()
</del><ins>+env = nil
+db_conn = nil
+count = 0
</ins><span class="cx">
</span><del>---local file = assert(io.open("output.lua", "w"))
---file:write("Hello world\n")
---file:close()
</del><ins>+function luaexec_init ()
+ env = assert(luasql.odbc())
+ db_conn = assert(env:connect("ddp") )
+ count = 1
+end
</ins><span class="cx">
</span><ins>+
+function luaexec_free ()
+ db_conn:close()
+ env:close()
+end
+
+function luaexec_main ()
+
+ uuid = xcdr_varget("uuid")
+ billsec = xcdr_varget("billsec")
+
+ db_conn:execute(string.format("insert into planeta_cdr_notify (uuid,billsec) values ('%s', %d)", uuid, billsec + count))
+ count = count + 1
+end
+
</ins></span></pre></div>
<a id="freeswitchtrunkcontribnazimxmlcdrdpluginsluaexecluaexecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/nazim/xmlcdrd/plugins/luaexec/luaexec.c (16978 => 16979)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/nazim/xmlcdrd/plugins/luaexec/luaexec.c 2010-03-12 22:11:43 UTC (rev 16978)
+++ freeswitch/trunk/contrib/nazim/xmlcdrd/plugins/luaexec/luaexec.c 2010-03-12 23:06:36 UTC (rev 16979)
</span><span class="lines">@@ -1,6 +1,44 @@
</span><span class="cx"> /*
</span><span class="cx"> plugin_init() accepts single option - absolute name of configuration file to parse.
</span><ins>+
+ Lua script _must_ provide three functions:
+ luaexec_init()
+ luaexec_free()
+ luaexec_man()
+
+ Functions listed above can be empty, but they must exist for successful run.
+
+ ******* Example script ********
+require "luasql.odbc"
+
+env = nil
+db_conn = nil
+count = 0
+
+function luaexec_init ()
+ env = assert(luasql.odbc())
+ db_conn = assert(env:connect("ddp") )
+ count = 1
+end
+
+
+function luaexec_free ()
+ db_conn:close()
+ env:close()
+end
+
+function luaexec_main ()
+ uuid = xcdr_varget("uuid")
+ billsec = xcdr_varget("billsec")
+
+ db_conn:execute(string.format("insert into planeta_cdr_notify (uuid,billsec) values ('%s', %d)", uuid, billsec + count))
+
+ count = count + 1
+end
+
+ ******* End of example script ********
</ins><span class="cx"> */
</span><ins>+
</ins><span class="cx"> #include "plugcommon.h"
</span><span class="cx"> #include "plug.h"
</span><span class="cx"> #include "stmtexp.h"
</span><span class="lines">@@ -22,8 +60,13 @@
</span><span class="cx"> #define STR_LEN_MAX 256
</span><span class="cx">
</span><span class="cx"> /*that's what lua script would call to get variable*/
</span><del>-#define LUA_VAR_GET_FUNC "xcdr_varget"
</del><ins>+#define LUAEXEC_VAR_GET_FUNC "xcdr_varget"
</ins><span class="cx">
</span><ins>+/*Names of standard function which script must provide*/
+#define LUAEXEC_FUNC_INIT "luaexec_init"
+#define LUAEXEC_FUNC_FREE "luaexec_free"
+#define LUAEXEC_FUNC_PROCESS_CDR "luaexec_main"
+
</ins><span class="cx"> typedef struct luaexec_local_vars
</span><span class="cx"> {
</span><span class="cx"> char *t;
</span><span class="lines">@@ -117,6 +160,30 @@
</span><span class="cx"> snprintf (vars->luascript, FILENAME_LEN_MAX - 1, "%s", t);
</span><span class="cx">
</span><span class="cx"> config_destroy(&vars->cfg);
</span><ins>+
+ vars->L = lua_open();
+ luaL_openlibs (vars->L);
+
+ lua_pushcfunction(vars->L, l_varget);
+ lua_setglobal(vars->L, LUAEXEC_VAR_GET_FUNC);
+
+
+ if (luaL_loadfile(vars->L, vars->luascript) )
+ fprintf(stderr, "can't load file: %s, %s\n", vars->luascript,
+ lua_tostring(vars->L, -1));
+
+ if(lua_pcall(vars->L, 0, 0, 0) )
+ fprintf(stderr, "can't run file: %s, %s\n", vars->luascript,
+ lua_tostring(vars->L, -1));
+
+
+ lua_getglobal(vars->L, LUAEXEC_FUNC_INIT);
+ if(lua_pcall(vars->L, 0, 0, 0) )
+ fprintf(stderr, "can't run %s function: %s, %s\n",
+ LUAEXEC_FUNC_INIT,
+ vars->luascript,
+ lua_tostring(vars->L, -1));
+
</ins><span class="cx"> return PLUG_STATUS_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,6 +192,16 @@
</span><span class="cx"> {
</span><span class="cx"> vars = state->local_vars;
</span><span class="cx">
</span><ins>+ lua_getglobal(vars->L, LUAEXEC_FUNC_FREE);
+ if(lua_pcall(vars->L, 0, 0,0) )
+ fprintf(stderr, "can't run %s function: %s, %s\n",
+ LUAEXEC_FUNC_FREE,
+ vars->luascript,
+ lua_tostring(vars->L, -1));
+
+
+ lua_close (vars->L);
+
</ins><span class="cx"> free (vars);
</span><span class="cx">
</span><span class="cx"> return PLUG_STATUS_OK;
</span><span class="lines">@@ -137,23 +214,19 @@
</span><span class="cx"> vars = state->local_vars;
</span><span class="cx"> vars->vex = vex;
</span><span class="cx">
</span><del>- vars->L = lua_open();
- luaL_openlibs (vars->L);
-
- lua_pushcfunction(vars->L, l_varget);
- lua_setglobal(vars->L, LUA_VAR_GET_FUNC);
-
</del><span class="cx">
</span><del>- if (luaL_loadfile(vars->L, vars->luascript) )
- fprintf(stderr, "can't load file: %s, %s\n", vars->luascript,
- lua_tostring(vars->L, -1));
-
</del><ins>+ int res = PLUG_STATUS_OK;
</ins><span class="cx">
</span><del>- if(lua_pcall(vars->L, 0, 0, 0) )
- fprintf(stderr, "can't run file: %s, %s\n", vars->luascript,
</del><ins>+ lua_getglobal(vars->L, LUAEXEC_FUNC_PROCESS_CDR);
+ if(lua_pcall(vars->L, 0, 0, 0))
+ {
+ fprintf(stderr, "can't run %s function: %s, %s\n",
+ LUAEXEC_FUNC_PROCESS_CDR,
+ vars->luascript,
</ins><span class="cx"> lua_tostring(vars->L, -1));
</span><ins>+
+ res = PLUG_STATUS_ERROR;
+ }
</ins><span class="cx">
</span><del>- lua_close (vars->L);
-
- return PLUG_STATUS_OK;
</del><ins>+ return res;
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>