<!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][14825] </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=14825">14825</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-09-11 09:48:42 -0500 (Fri, 11 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed all unnecessary cruft, added comments and fixed a typo in main configuration file</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>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbcconfxml">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml</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 (14824 => 14825)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-11 13:07:31 UTC (rev 14824)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-11 14:48:42 UTC (rev 14825)
</span><span class="lines">@@ -37,21 +37,9 @@
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown);
</span><del>-SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_odbc_runtime);
</del><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load);
</span><del>-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
</del><span class="cx"> SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL);
</span><span class="cx">
</span><del>-typedef enum {
- XML_ODBC_CONFIGURATION = 0,
- XML_ODBC_DIRECTORY = 0,
- XML_ODBC_DIALPLAN = 0,
- XML_ODBC_PHRASES = 0
-} xml_odbc_query_type_t;
-
</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">@@ -145,10 +133,9 @@
</span><span class="cx"> switch_event_add_header_string(helper->event, SWITCH_STACK_BOTTOM, columnName[i], argv[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* up the rowcount, store it in a temporary variable and set rowcount to zero as children may use it */
</del><ins>+ /* up the rowcount and store it in a temporary variable */
</ins><span class="cx"> helper->rowcount++;
</span><span class="cx"> tmp_rowcount = helper->rowcount;
</span><del>- helper->rowcount = 0;
</del><span class="cx">
</span><span class="cx"> /* render all children */
</span><span class="cx"> xml_odbc_render_children(helper);
</span><span class="lines">@@ -160,6 +147,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* xml-odbc-do break-to
+ * set the next_template_name
+ * this will break the loop in xml_odbc_render_children, which resets xml_odbc_render_template
+ */
</ins><span class="cx"> static switch_status_t xml_odbc_do_break_to(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><span class="cx"> char *value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "value");
</span><span class="lines">@@ -170,6 +161,11 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* xml-odbc-do set-event-header (check-event-header goes here too)
+ * if if-name or (if-name and if-value) match then
+ * set to-name and / or to-value event headers
+ * after that, render all xml children (when available)
+ */
</ins><span class="cx"> static switch_status_t xml_odbc_do_set_event_header(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><span class="cx"> char *name = (char *) switch_xml_attr(helper->xml_in_cur, "name"); /* the xml-odbc-do name attr */
</span><span class="lines">@@ -226,6 +222,11 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* xml-odbc-do query
+ * performs sql query as defined in 'value'
+ * on each row returned, execute xml_odbc_query_callback
+ * if no rows are returned and on-empty-result-break-to is set, then set that as next_template_name
+ */
</ins><span class="cx"> static switch_status_t xml_odbc_do_query(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><span class="cx"> char *value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "value");
</span><span class="lines">@@ -237,6 +238,8 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG Performing Query:\n%s\n", new_value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ helper->rowcount = 0;
+
</ins><span class="cx"> if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, helper) != SWITCH_ODBC_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", new_value);
</span><span class="cx"> goto done;
</span><span class="lines">@@ -270,7 +273,7 @@
</span><span class="cx"> if (!strcasecmp(name, "break-to")) {
</span><span class="cx"> status = xml_odbc_do_break_to(helper);
</span><span class="cx"> } else if (!strcasecmp(name, "check-event-header")) { /* check-event-header is the same as set-event-header */
</span><del>- status = xml_odbc_do_set_event_header(helper); /* except no to-name or to-value are given.. */
</del><ins>+ status = xml_odbc_do_set_event_header(helper); /* except no to-name or to-value are given.. */
</ins><span class="cx"> } else if (!strcasecmp(name, "set-event-header")) {
</span><span class="cx"> status = xml_odbc_do_set_event_header(helper);
</span><span class="cx"> } else if (!strcasecmp(name, "query")) {
</span><span class="lines">@@ -375,24 +378,25 @@
</span><span class="cx">
</span><span class="cx"> goto done;
</span><span class="cx">
</span><del>- reset:
</del><ins>+ reset:
</ins><span class="cx"> status = xml_odbc_render_template(helper);
</span><span class="cx">
</span><span class="cx"> done:
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* xml_odbc_search - the function that is called by fs_core */
</ins><span class="cx"> static switch_xml_t xml_odbc_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *event, void *user_data)
</span><span class="cx"> {
</span><span class="cx"> xml_binding_t *binding = (xml_binding_t *) user_data;
</span><span class="cx"> switch_event_header_t *hi;
</span><span class="cx"> switch_uuid_t uuid;
</span><span class="cx"> char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
</span><del>- char *xml_char; /* a char representation of the generated xml that will be written to temp file */
- switch_memory_pool_t *pool; /* for easy memory cleanup */
- xml_odbc_session_helper_t helper; /* this helper is sent through all other functions to generate the xml */
- switch_xml_t xml_out = NULL; /* the xml that will be returned by this function */
- char filename[512] = ""; /* the temporary, uuid-based filename */
</del><ins>+ char *xml_char; /* a char representation of the generated xml that will be written to temp file */
+ switch_memory_pool_t *pool; /* for easy memory cleanup */
+ xml_odbc_session_helper_t helper; /* this helper is sent through all other functions to generate the xml */
+ switch_xml_t xml_out = NULL; /* the xml that will be returned by this function */
+ char filename[512] = ""; /* the temporary, uuid-based filename */
</ins><span class="cx"> int fd;
</span><span class="cx">
</span><span class="cx"> if (!binding) {
</span><span class="lines">@@ -484,7 +488,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cleanup:
</del><ins>+ cleanup:
</ins><span class="cx"> switch_xml_free(helper.xml_out);
</span><span class="cx"> switch_core_destroy_memory_pool(&pool);
</span><span class="cx">
</span><span class="lines">@@ -494,9 +498,6 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t do_config(switch_bool_t reload)
</span><span class="cx"> {
</span><del>-
-// if (switch_xml_config_parse_module_se blah blah SWITCH_STATUS_GENERR !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
</del><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></pre></div>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbcconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml (14824 => 14825)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-09-11 13:07:31 UTC (rev 14824)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-09-11 14:48:42 UTC (rev 14825)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> </xml-odbc-do>
</span><span class="cx"> </template>
</span><span class="cx">
</span><del>- <template name="simple_configuration">
</del><ins>+ <template name="simple-configuration">
</ins><span class="cx"> <document type="freeswitch/xml">
</span><span class="cx"> <configuration name="${key_value}">
</span><span class="cx"> <settings>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>