<!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][14130] </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=14130">14130</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-07-04 04:58:37 -0500 (Sat, 04 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>again big changes, need backup in svn, will document in wiki when this works</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 (14129 => 14130)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-03 22:09:54 UTC (rev 14129)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-04 09:58:37 UTC (rev 14130)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx">
</span><span class="cx"> static struct {
</span><span class="cx"> char *odbc_dsn;
</span><del>- char *configuration_template_name;
- char *directory_template_name;
- char *dialplan_template_name;
- char *phrases_template_name;
</del><ins>+// char *configuration_template_name;
+// char *directory_template_name;
+// char *dialplan_template_name;
+// char *phrases_template_name;
</ins><span class="cx"> switch_xml_t templates_tag;
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="lines">@@ -109,13 +109,24 @@
</span><span class="cx"> char *bindings;
</span><span class="cx"> } xml_binding_t;
</span><span class="cx">
</span><ins>+static char* switch_event_expand_headers_by_pool(switch_memory_pool_t *pool, switch_event_t *event, const char *in) /* perhaps it's handy if this is moved to switch_event.c ? */
+{
+ char *tmp, *out;
+
+ tmp = switch_event_expand_headers(event, in);
+ out = switch_core_strdup(pool, tmp);
+ if (tmp != in) switch_safe_free(tmp);
+
+ return out;
+}
+
</ins><span class="cx"> static int xml_odbc_query_callback(void *pArg, int argc, char **argv, char **columnName)
</span><span class="cx"> {
</span><span class="cx"> xml_odbc_session_helper_t *helper = (xml_odbc_session_helper_t *) pArg;
</span><span class="cx"> switch_xml_t xml_in_tmp;
</span><span class="cx"> int i;
</span><span class="cx">
</span><del>-// only continue if helper->next_template_name is set !
</del><ins>+// only continue if helper->next_template_name is NOT set !
</ins><span class="cx">
</span><span class="cx"> /* up the row counter */
</span><span class="cx"> helper->tmp_i++; // TODO: THIS WILL GO WRONG FOR NESTED QUERIES.. THINK ABOUT IT !!!
</span><span class="lines">@@ -128,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> /* render all children of xml_in */
</span><span class="cx"> for (xml_in_tmp = helper->xml_in_cur->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) {
</span><del>-// only continue if helper->next_template_name is set !
</del><ins>+// only continue if helper->next_template_name is NOT set !
</ins><span class="cx"> helper->xml_in_cur = xml_in_tmp;
</span><span class="cx"> xml_odbc_render_tag(helper);
</span><span class="cx"> }
</span><span class="lines">@@ -146,19 +157,20 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t xml_odbc_do_if_header(xml_odbc_session_helper_t *helper)
</del><ins>+static switch_status_t xml_odbc_do_check_event_header(xml_odbc_session_helper_t *helper)
</ins><span class="cx"> {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t xml_odbc_do_replace_header_value(xml_odbc_session_helper_t *helper)
</del><ins>+static switch_status_t xml_odbc_do_set_event_header(xml_odbc_session_helper_t *helper)
</ins><span class="cx"> {
</span><del>- char *old_header_value = NULL;
</del><span class="cx"> char *name = (char *) switch_xml_attr_soft(helper->xml_in_cur, "name");
</span><del>- char *when_name = (char *) switch_xml_attr_soft(helper->xml_in_cur, "when-name");
- char *when_value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "when-value");
</del><ins>+ char *if_name = (char *) switch_xml_attr_soft(helper->xml_in_cur, "if-name");
+ char *if_value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "if-value");
</ins><span class="cx"> char *value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "value");
</span><del>- char *new_value = switch_event_expand_headers(helper->event, value); /////// LEAK !!!!!!!
</del><ins>+ char *old_value = NULL;
+ char *new_value = switch_event_expand_headers_by_pool(helper->pool, helper->event, value);
+
</ins><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(value)) {
</span><span class="lines">@@ -166,10 +178,10 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((old_header_value = switch_event_get_header(helper->event, when_name))) {
- if (switch_strlen_zero(when_value) || !strcasecmp(when_value, old_header_value)) {
- switch_event_del_header(helper->event, when_name);
- switch_event_add_header_string(helper->event, SWITCH_STACK_BOTTOM, when_name, new_value);
</del><ins>+ if ((old_value = switch_event_get_header(helper->event, if_name))) {
+ if (switch_strlen_zero(if_value) || !strcasecmp(if_value, old_value)) {
+ switch_event_del_header(helper->event, if_name);
+ switch_event_add_header_string(helper->event, SWITCH_STACK_BOTTOM, if_name, new_value);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,14 +239,10 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(name, "break-to")) {
</span><span class="cx"> status = xml_odbc_do_break_to(helper);
</span><del>- } else if (!strcasecmp(name, "if_header")) {
- status = xml_odbc_do_if_header(helper);
-// } else if (!strcasecmp(name, "set-header-name")) {
-// status = xml_odbc_do_set_header_name(helper);
-// } else if (!strcasecmp(name, "set-header-value")) {
-// status = xml_odbc_do_set_header_value(helper);
- } else if (!strcasecmp(name, "replace_header_value")) { // DEPRECATED REMOVE THIS FUNCTION!!
- status = xml_odbc_do_replace_header_value(helper); // DEPRECATED REMOVE THIS FUNCTION!!
</del><ins>+ } else if (!strcasecmp(name, "check-event-header")) {
+ status = xml_odbc_do_check_event_header(helper);
+ } else if (!strcasecmp(name, "set-event-header")) {
+ status = xml_odbc_do_set_event_header(helper);
</ins><span class="cx"> } else if (!strcasecmp(name, "query")) {
</span><span class="cx"> status = xml_odbc_do_query(helper);
</span><span class="cx"> } else {
</span><span class="lines">@@ -252,16 +260,10 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* copy all attrs */
</del><ins>+ /* copy all expanded attrs */
</ins><span class="cx"> for (i=0; helper->xml_in_cur->attr[i]; i+=2) {
</span><del>- char *tmp_attr, *tmp_attr2;
- tmp_attr = switch_event_expand_headers(helper->event, helper->xml_in_cur->attr[i+1]);
- tmp_attr2 = switch_core_strdup(helper->pool, tmp_attr); // BAH Can't I use a switch_event_expand_headers that uses helper->pool ?
- switch_xml_set_attr(helper->xml_out_cur, helper->xml_in_cur->attr[i], tmp_attr2);
-
- if (tmp_attr != helper->xml_in_cur->attr[i+1]) {
- switch_safe_free(tmp_attr);
- }
</del><ins>+ char *tmp_attr = switch_event_expand_headers_by_pool(helper->pool, helper->event, helper->xml_in_cur->attr[i+1]);
+ switch_xml_set_attr(helper->xml_in_cur, helper->xml_in_cur->attr[i], tmp_attr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* render all children */
</span><span class="lines">@@ -354,7 +356,11 @@
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx"> helper.pool = pool;
</span><span class="cx">
</span><ins>+ /* set the default template to render */
+ helper.next_template_name = "default";
+
</ins><span class="cx"> /* find out what template to render, and put it in helper.next_template_name */
</span><ins>+/*
</ins><span class="cx"> if (!strcmp(section, "configuration")) {
</span><span class="cx"> helper.next_template_name = switch_core_strdup(pool, globals.configuration_template_name);
</span><span class="cx"> } else if (!strcmp(section, "directory")) {
</span><span class="lines">@@ -367,10 +373,11 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid section\n");
</span><span class="cx"> goto cleanup;
</span><span class="cx"> }
</span><ins>+*/
</ins><span class="cx">
</span><span class="cx"> /* add some headers to event and put it in the helper */
</span><span class="cx"> gethostname(hostname, sizeof(hostname));
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_TOP, "hostname", hostname);
</del><ins>+// switch_event_add_header_string(event, SWITCH_STACK_TOP, "hostname", hostname); // IS THIS ALWAYS PASSED AS FreeSWITCH-Hostname ??
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_TOP, "section", switch_str_nil(section));
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_TOP, "tag_name", switch_str_nil(tag_name));
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_TOP, "key_name", switch_str_nil(key_name));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>