<!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][14799] </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=14799">14799</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-09-09 15:57:09 -0500 (Wed, 09 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Oooooh yea!! reloadxml doesn't break the module anymore !!! :-)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c (14798 => 14799)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-09 19:56:22 UTC (rev 14798)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-09 20:57:09 UTC (rev 14799)
</span><span class="lines">@@ -36,6 +36,15 @@
</span><span class="cx"> */
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><ins>+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown);
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_odbc_runtime);
+SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load);
+
+/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
+ * Defines a switch_loadable_module_function_table_t and a static const char[] modname
+ */
+SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL);
+
</ins><span class="cx"> typedef enum {
</span><span class="cx"> XML_ODBC_CONFIGURATION = 0,
</span><span class="cx"> XML_ODBC_DIRECTORY = 0,
</span><span class="lines">@@ -43,10 +52,6 @@
</span><span class="cx"> XML_ODBC_PHRASES = 0
</span><span class="cx"> } xml_odbc_query_type_t;
</span><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown);
-SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL);
-
</del><span class="cx"> static struct {
</span><span class="cx"> char *odbc_dsn;
</span><span class="cx"> switch_xml_t templates_tag;
</span><span class="lines">@@ -58,6 +63,9 @@
</span><span class="cx"> int max_render_template_count;
</span><span class="cx"> } globals;
</span><span class="cx">
</span><ins>+static switch_event_node_t *NODE = NULL;
+
+/* this struct is created on calling of xml_odbc_search and passed on through all child functions */
</ins><span class="cx"> typedef struct xml_odbc_session_helper {
</span><span class="cx"> switch_memory_pool_t *pool; /* memory pool that is destroyed at the end of the session to ease free'ing */
</span><span class="cx"> char *next_template_name; /* the name of the next template that has to be rendered */
</span><span class="lines">@@ -73,9 +81,15 @@
</span><span class="cx"> static switch_status_t xml_odbc_render_tag(xml_odbc_session_helper_t *helper);
</span><span class="cx"> static switch_status_t xml_odbc_render_children(xml_odbc_session_helper_t *helper);
</span><span class="cx"> static switch_status_t xml_odbc_render_template(xml_odbc_session_helper_t *helper);
</span><ins>+static switch_status_t do_config(switch_bool_t reload);
</ins><span class="cx">
</span><span class="cx"> #define XML_ODBC_SYNTAX "[debug_on|debug_off]"
</span><span class="cx">
</span><ins>+static void event_handler(switch_event_t *event)
+{
+ do_config(SWITCH_TRUE);
+}
+
</ins><span class="cx"> /* cli commands */
</span><span class="cx"> SWITCH_STANDARD_API(xml_odbc_function)
</span><span class="cx"> {
</span><span class="lines">@@ -478,8 +492,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static switch_status_t do_config()
</del><ins>+static switch_status_t do_config(switch_bool_t reload)
</ins><span class="cx"> {
</span><ins>+
+// if (switch_xml_config_parse_module_se blah blah SWITCH_STATUS_GENERR !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
</ins><span class="cx"> char *cf = "xml_odbc.conf";
</span><span class="cx"> switch_xml_t cfg, xml, settings_tag, templates_tag, param;
</span><span class="cx"> xml_binding_t *binding = NULL;
</span><span class="lines">@@ -614,11 +631,16 @@
</span><span class="cx">
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><del>- if (do_config() != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (do_config(SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event!\n");
+ return SWITCH_STATUS_TERM;
+ }
+
</ins><span class="cx"> SWITCH_ADD_API(xml_odbc_api_interface, "xml_odbc", "XML ODBC", xml_odbc_function, XML_ODBC_SYNTAX);
</span><span class="cx"> switch_console_set_complete("add xml_odbc debug_on");
</span><span class="cx"> switch_console_set_complete("add xml_odbc debug_off");
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>